diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll
deleted file mode 100644
index 99c42d6b4..000000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.UnityExtensions.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll
deleted file mode 100644
index 383c1f46d..000000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Prism.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll
deleted file mode 100644
index 3f8895473..000000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.ServiceLocation.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll b/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll
deleted file mode 100644
index 84f1870df..000000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Prism/Microsoft.Practices.Unity.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.DataGrid.Samples.SampleData.dll b/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.DataGrid.Samples.SampleData.dll
deleted file mode 100644
index 9d98cb473..000000000
Binary files a/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.DataGrid.Samples.SampleData.dll and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll b/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll
new file mode 100644
index 000000000..050b99de0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Libs/Xceed.Wpf.Samples.SampleData.dll differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
deleted file mode 100644
index f557ccdd3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.BusyIndicator.NavigationItems;
-using Samples.Modules.BusyIndicator.Views;
-
-namespace Samples.Modules.BusyIndicator
-{
-  public class BusyIndicatorModule : ModuleBase
-  {
-    public BusyIndicatorModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( BusyIndicatorView ) );
-      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentView ) );
-      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentTemplateView ) );
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( BusyIndicatorNavItem ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
deleted file mode 100644
index 75012fa25..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.BusyIndicator.NavigationItems.BusyIndicatorNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.BusyIndicator.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.BusyIndicator.Views"
-              Header="BusyIndicator" Tag="{x:Type views:BusyIndicatorView}">
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:BusyIndicatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-   <TreeViewItem Header="Custom Content" Tag="{x:Type views:BusyIndicatorCustomContentView}" />
-   <TreeViewItem Header="Custom Content Template" Tag="{x:Type views:BusyIndicatorCustomContentTemplateView}" />
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
deleted file mode 100644
index 5206b62d7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows.Controls;
-
-namespace Samples.Modules.BusyIndicator.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for BusyIndicatorNavItem.xaml
-  /// </summary>
-  public partial class BusyIndicatorNavItem : TreeViewItem
-  {
-    public BusyIndicatorNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
deleted file mode 100644
index bc2c59926..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit BusyIndicator Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit BusyIndicator Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
deleted file mode 100644
index 5b3381524..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
-
-   <DataTemplate x:Key="SampleContent">
-      <Grid Margin="10">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-         </Grid.RowDefinitions>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-
-         <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
-         <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
-
-         <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
-         <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
-
-         <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
-         <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
-
-         <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
-         <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
-
-         <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
-         <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
-
-         <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-            <Button Width="65" Margin="2">OK</Button>
-            <Button Width="65" Margin="2">Cancel</Button>
-         </StackPanel>
-      </Grid>
-   </DataTemplate>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj
deleted file mode 100644
index e7559aab6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Samples.Modules.BusyIndicator.csproj
+++ /dev/null
@@ -1,120 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.BusyIndicator</RootNamespace>
-    <AssemblyName>Samples.Modules.BusyIndicator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="BusyIndicatorModule.cs" />
-    <Compile Include="NavigationItems\BusyIndicatorNavItem.xaml.cs">
-      <DependentUpon>BusyIndicatorNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\BusyIndicatorCustomContentView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\BusyIndicatorView.xaml.cs">
-      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="NavigationItems\BusyIndicatorNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\BusyIndicatorCustomContentTemplateView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\BusyIndicatorCustomContentView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\BusyIndicatorView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\CdBurning32.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
deleted file mode 100644
index e3c868132..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentTemplateView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="BusyIndicator"
-                 Description="This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style.">
-
-   <sample:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </sample:DemoView.Resources>
-
-   <StackPanel Grid.Row="1" Margin="10">
-      <TextBlock Grid.Row="2" Text="Custom Content Template:" Style="{StaticResource Header}" />
-      <xctk:BusyIndicator IsBusy="True">
-         <xctk:BusyIndicator.BusyContentTemplate>
-            <DataTemplate>
-               <StackPanel Margin="4">
-                  <TextBlock Text="Downloading Email" FontWeight="Bold" HorizontalAlignment="Center" />
-                  <StackPanel Margin="4">
-                     <TextBlock Text="Downloading message 4/10..." />
-                     <ProgressBar Value="40" Height="15" />
-                  </StackPanel>
-                  <Grid>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition/>
-                        <ColumnDefinition/>
-                     </Grid.ColumnDefinitions>
-                     <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Right" Margin="0 0 2 0" />
-                     <Button Grid.Column="1" Content="Cancel" HorizontalAlignment="Left" Margin="2 0 0 0" />
-                  </Grid>
-               </StackPanel>
-            </DataTemplate>
-         </xctk:BusyIndicator.BusyContentTemplate>
-         <xctk:BusyIndicator.OverlayStyle>
-            <Style TargetType="Rectangle">
-               <Setter Property="Fill" Value="#B1EB1D1D" />
-            </Style>
-         </xctk:BusyIndicator.OverlayStyle>
-         <xctk:BusyIndicator.ProgressBarStyle>
-            <Style TargetType="ProgressBar">
-               <Setter Property="Visibility" Value="Collapsed" />
-            </Style>
-         </xctk:BusyIndicator.ProgressBarStyle>
-
-         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-      </xctk:BusyIndicator>
-   </StackPanel>
-</sample:DemoView>
-
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
deleted file mode 100644
index b4c8f0f6a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.BusyIndicator.Views
-{
-  /// <summary>
-  /// Interaction logic for BusyIndicatorCustomContentTemplateView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class BusyIndicatorCustomContentTemplateView : DemoView
-  {
-    public BusyIndicatorCustomContentTemplateView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
deleted file mode 100644
index a22017866..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="BusyIndicator"
-                 Description="This example demonstrates how to define your own custom content. This is done by setting the BusyContent property.">
-   <sample:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-   </sample:DemoView.Resources>
-
-   <StackPanel Margin="10">
-      <TextBlock Text="Custom Content:" Style="{StaticResource Header}" />
-      <xctk:BusyIndicator IsBusy="True">
-         <xctk:BusyIndicator.BusyContent>
-            <StackPanel Orientation="Horizontal">
-               <Image Source="/Samples.Modules.BusyIndicator;component/Images/CdBurning32.png" />
-               <StackPanel Margin="5,0">
-                  <TextBlock Text="Burning CD..." VerticalAlignment="Center" />
-                  <TextBlock Text="Madonna - Like a Virgin" VerticalAlignment="Center" Margin="8,0" />
-               </StackPanel>
-            </StackPanel>
-         </xctk:BusyIndicator.BusyContent>
-         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-      </xctk:BusyIndicator>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
deleted file mode 100644
index 9f898a72e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.BusyIndicator.Views
-{
-  /// <summary>
-  /// Interaction logic for BusyIndicatorCustomContentView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class BusyIndicatorCustomContentView : DemoView
-  {
-    public BusyIndicatorCustomContentView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
deleted file mode 100644
index 62f55f6f9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
+++ /dev/null
@@ -1,74 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Samples.Modules.BusyIndicator.Views"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="BusyIndicator"
-                 Description="BusyIndicator makes it easy to let the user know when an application is busy. Simply wrap the relevant content in an instance of the BusyIndicator control and toggle its IsBusy property to True during any long-running process.">
-
-   <sample:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-         <local:IntegerToTimespanConverter x:Key="TimeSpanConverter" />
-      </ResourceDictionary>
-   </sample:DemoView.Resources>
-
-   <Grid>
-
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="IsBusy:" VerticalAlignment="Center" Margin="2" />
-            <CheckBox x:Name="_isBusy" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true shows the BusyIndicator" />
-
-            <TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
-            <StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
-               <xctk:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Text="0" DefaultValue="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
-               <TextBlock Text="milliseconds" Margin="5,0"  VerticalAlignment="Center" />
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <xctk:BusyIndicator IsBusy="{Binding IsChecked, ElementName=_isBusy}" DisplayAfter="{Binding Value, ElementName=_displayAfter, Converter={StaticResource TimeSpanConverter}}">
-            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-         </xctk:BusyIndicator>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
deleted file mode 100644
index cad93d4c0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows.Data;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.BusyIndicator.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class BusyIndicatorView : DemoView
-  {
-    public BusyIndicatorView()
-    {
-      InitializeComponent();
-    }
-  }
-
-  public class IntegerToTimespanConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return TimeSpan.FromMilliseconds( ( int )value );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
deleted file mode 100644
index 1927b06f0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Button.NavigationItems;
-using Samples.Modules.Button.Views;
-
-namespace Samples.Modules.Button
-{
-  public class ButtonModule : ModuleBase
-  {
-    public ButtonModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( ButtonSpinnerNavItem ) );
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( DropDownButtonNavItem ) );
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( SplitButtonNavItem ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( ButtonSpinnerView ) );
-      Container.RegisterNavigationType( typeof( DropDownButtonView ) );
-      Container.RegisterNavigationType( typeof( SplitButtonView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
deleted file mode 100644
index beef61c24..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.ButtonSpinnerNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.Button.Views" 
-              Header="ButtonSpinner" Tag="{x:Type views:ButtonSpinnerView}" >
-
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:ButtonSpinnerNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
deleted file mode 100644
index 90cbb1145..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Button.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for ButtonSpinnerNavItem.xaml
-  /// </summary>
-  public partial class ButtonSpinnerNavItem : TreeViewItem
-  {
-    public ButtonSpinnerNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
deleted file mode 100644
index 140035b2b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.DropDownButtonNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.Button.Views"
-              Header="DropDownButton" Tag="{x:Type views:DropDownButtonView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:DropDownButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
deleted file mode 100644
index 36556aec4..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Button.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for DropDownButtonNavItem.xaml
-  /// </summary>
-  public partial class DropDownButtonNavItem : TreeViewItem
-  {
-    public DropDownButtonNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
deleted file mode 100644
index 0ddabf1e0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.SplitButtonNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.Button.Views"
-              Header="SplitButton" Tag="{x:Type views:SplitButtonView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:SplitButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
deleted file mode 100644
index 2a52efb8e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Button.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for SplitButtonNavItem.xaml
-  /// </summary>
-  public partial class SplitButtonNavItem : TreeViewItem
-  {
-    public SplitButtonNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
deleted file mode 100644
index 552e1b379..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Button Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Button Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj
deleted file mode 100644
index 9437879bd..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Samples.Modules.Button.csproj
+++ /dev/null
@@ -1,130 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{22F36E4A-98E6-4A1C-96CA-52CA46F19274}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Button</RootNamespace>
-    <AssemblyName>Samples.Modules.Button</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ButtonModule.cs" />
-    <Compile Include="NavigationItems\ButtonSpinnerNavItem.xaml.cs">
-      <DependentUpon>ButtonSpinnerNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NavigationItems\DropDownButtonNavItem.xaml.cs">
-      <DependentUpon>DropDownButtonNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NavigationItems\SplitButtonNavItem.xaml.cs">
-      <DependentUpon>SplitButtonNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ButtonSpinnerView.xaml.cs">
-      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\DropDownButtonView.xaml.cs">
-      <DependentUpon>DropDownButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SplitButtonView.xaml.cs">
-      <DependentUpon>SplitButtonView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="NavigationItems\ButtonSpinnerNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NavigationItems\DropDownButtonNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NavigationItems\SplitButtonNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ButtonSpinnerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\DropDownButtonView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\SplitButtonView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
deleted file mode 100644
index 19c8127e1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
+++ /dev/null
@@ -1,80 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Button.Views.ButtonSpinnerView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 Title="ButtonSpinner"
-                 Description="The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement.">
-   <sample:DemoView.Resources>
-      <x:Array x:Key="names" Type="s:String">
-         <s:String>John Smith</s:String>
-         <s:String>Janel Leverling</s:String>
-         <s:String>Laura Callahan</s:String>
-         <s:String>Robert King</s:String>
-         <s:String>Margaret Peacock</s:String>
-         <s:String>Andrew Fuller</s:String>
-         <s:String>Anne Dodsworth</s:String>
-         <s:String>Nancy Davolio</s:String>
-         <s:String>Naomi Suyama</s:String>
-      </x:Array>
-   </sample:DemoView.Resources>
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="AllowSpin:" VerticalAlignment="Center" />
-            <CheckBox x:Name="_allowSpin" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true allows the ButtonSpinner to perform increment/decrement operations." />
-
-            <TextBlock Text="ShowButtonSpinner:" VerticalAlignment="Center" Grid.Row="1" />
-            <CheckBox x:Name="_showButtonSpinner" Grid.Row="1" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the visibility of the button spinners." />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <TextBlock Text="You can wrap any element by placing it inside the content area of the ButtonSpinner control."
-                    TextWrapping="Wrap" />
-
-         <xctk:ButtonSpinner Margin="10" 
-                             Width="150" 
-                             HorizontalAlignment="Left"
-                             AllowSpin="{Binding IsChecked, ElementName=_allowSpin}"
-                             ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner}"
-                             Spin="ButtonSpinner_Spin">
-            <TextBox Text="John Smith" IsReadOnly="True" BorderThickness="0" HorizontalContentAlignment="Right" />
-         </xctk:ButtonSpinner>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
deleted file mode 100644
index a552f35a4..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows.Controls;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using Xceed.Wpf.Toolkit;
-
-namespace Samples.Modules.Button.Views
-{
-  /// <summary>
-  /// Interaction logic for ButtonSpinnerView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class ButtonSpinnerView : DemoView
-  {
-    public ButtonSpinnerView()
-    {
-      InitializeComponent();
-    }
-
-    private void ButtonSpinner_Spin( object sender, SpinEventArgs e )
-    {
-      String[] names = (String[])this.Resources[ "names" ];
-
-      ButtonSpinner spinner = ( ButtonSpinner )sender;
-      TextBox txtBox = ( TextBox )spinner.Content;
-
-      int value = Array.IndexOf( names, txtBox.Text );
-      if( e.Direction == SpinDirection.Increase )
-        value++;
-      else
-        value--;
-
-      if( value < 0 )
-        value = names.Length - 1;
-      else if( value >= names.Length )
-        value = 0;
-
-      txtBox.Text = names[ value ];
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
deleted file mode 100644
index ef033ca77..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Button.Views.DropDownButtonView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="DropDownButton"
-                 Description="The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="IsOpen: " VerticalAlignment="Center" />
-            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <xctk:DropDownButton x:Name="_dropDownButton"
-                              Margin="10"
-                              Width="150"
-                              HorizontalAlignment="Left"
-                              Content="Click Me"
-                              IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
-                              Click="DropDownButton_Click">
-            <xctk:DropDownButton.DropDownContent>
-               <StackPanel>
-                  <xctk:ColorCanvas />
-                  <Button Click="Button_Click" Margin="10">OK</Button>
-               </StackPanel>
-            </xctk:DropDownButton.DropDownContent>
-         </xctk:DropDownButton>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
deleted file mode 100644
index 1a06cdd9d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Button.Views
-{
-  /// <summary>
-  /// Interaction logic for DropDownButtonView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class DropDownButtonView : DemoView
-  {
-    public DropDownButtonView()
-    {
-      InitializeComponent();
-    }
-
-    private void DropDownButton_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-
-    }
-
-    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      _dropDownButton.IsOpen = false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
deleted file mode 100644
index a7812871b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
+++ /dev/null
@@ -1,66 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Button.Views.SplitButtonView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="SplitButton"
-                 Description="The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="IsOpen: " VerticalAlignment="Center" />
-            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <xctk:SplitButton x:Name="_splitButton"
-                           Margin="10"
-                           Width="150"
-                           HorizontalAlignment="Left"
-                           Content="Click Me"
-                           IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
-                           Click="SplitButton_Click">
-            <xctk:SplitButton.DropDownContent>
-               <StackPanel>
-                  <xctk:ColorCanvas />
-                  <Button Click="Button_Click" Margin="10">OK</Button>
-               </StackPanel>
-            </xctk:SplitButton.DropDownContent>
-         </xctk:SplitButton>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
deleted file mode 100644
index 21a44cd0b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Button.Views
-{
-  /// <summary>
-  /// Interaction logic for SplitButtonView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class SplitButtonView : DemoView
-  {
-    public SplitButtonView()
-    {
-      InitializeComponent();
-    }
-
-    private void SplitButton_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      Xceed.Wpf.Toolkit.MessageBox.Show( "Thanks for clicking me!", "SplitButton Click" );
-    }
-
-    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      _splitButton.IsOpen = false;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs
deleted file mode 100644
index e241e0651..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/CalculatorModule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Calculator.NavigationItems;
-using Samples.Modules.Calculator.Views;
-
-namespace Samples.Modules.Calculator
-{
-  public class CalculatorModule : ModuleBase
-  {
-    public CalculatorModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorNavItem ) );
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorUpDownNavItem ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( CalculatorView ) );
-      Container.RegisterNavigationType( typeof( CalculatorUpDownView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Converters/FormatStringToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Converters/FormatStringToVisibilityConverter.cs
deleted file mode 100644
index 395eab495..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Converters/FormatStringToVisibilityConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Samples.Modules.Calculator.Converters
-{
-  class FormatStringToVisibilityConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      //When FormatString received is empty, make the Precision property Visible.
-      //This is to prevent something like this: Precision = "5" AND FormatString = "C2".
-      if( string.IsNullOrEmpty( ( string )value ) )
-        return Visibility.Visible;
-      return Visibility.Hidden;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml
deleted file mode 100644
index 34c25893e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
-              Header="Calculator" Tag="{x:Type views:CalculatorView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:CalculatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs
deleted file mode 100644
index 7a9483e2a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Calculator.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for CalculatorNavItem.xaml
-  /// </summary>
-  public partial class CalculatorNavItem : TreeViewItem
-  {
-    public CalculatorNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml
deleted file mode 100644
index 9cd7b8e77..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorUpDownNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
-              xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
-              Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="navItems:CalculatorUpDownNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
deleted file mode 100644
index e31c2ece4..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Calculator.NavigationItems
-{
-  /// <summary>
-  /// Interaction logic for CalculatorUpDownNavItem.xaml
-  /// </summary>
-  public partial class CalculatorUpDownNavItem : TreeViewItem
-  {
-    public CalculatorUpDownNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs
deleted file mode 100644
index c5e9f3f6b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Calculator Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Calculator Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj
deleted file mode 100644
index 596eb33ae..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Samples.Modules.Calculator.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Calculator</RootNamespace>
-    <AssemblyName>Samples.Modules.Calculator</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CalculatorModule.cs" />
-    <Compile Include="Converters\FormatStringToVisibilityConverter.cs" />
-    <Compile Include="NavigationItems\CalculatorNavItem.xaml.cs">
-      <DependentUpon>CalculatorNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="NavigationItems\CalculatorUpDownNavItem.xaml.cs">
-      <DependentUpon>CalculatorUpDownNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\CalculatorUpDownView.xaml.cs">
-      <DependentUpon>CalculatorUpDownView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CalculatorView.xaml.cs">
-      <DependentUpon>CalculatorView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="NavigationItems\CalculatorNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="NavigationItems\CalculatorUpDownNavItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CalculatorUpDownView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CalculatorView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml
deleted file mode 100644
index 87cf55a29..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorUpDownView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="CalculatorUpDown"
-                 xmlns:conv="clr-namespace:Samples.Modules.Calculator.Converters"
-                 Description="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations.">
-    <sample:DemoView.Resources>
-        <conv:FormatStringToVisibilityConverter x:Key="formatStringToVisibilityConverter" />
-    </sample:DemoView.Resources>
-
-    <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5" HorizontalAlignment="Left">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Enter Closes Calculator:" VerticalAlignment="Center" />
-            <CheckBox x:Name="_enterClosesCalculator" Grid.Column="1" VerticalAlignment="Center" Margin="5" />
-            <TextBlock Text="Watermark:" Grid.Row="1" VerticalAlignment="Center" />
-            <TextBox x:Name="_watermark" Grid.Row="1" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
-            <TextBlock Text="FormatString:" Grid.Row="2" VerticalAlignment="Center" />
-            <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="2" Grid.Column="1" Width="150" Margin="5">
-               <ComboBoxItem Tag="">None</ComboBoxItem>
-               <ComboBoxItem Tag="C">Currency</ComboBoxItem>
-               <ComboBoxItem Tag="F">Fixed Point</ComboBoxItem>
-               <ComboBoxItem Tag="G">General</ComboBoxItem>
-               <ComboBoxItem Tag="N">Number</ComboBoxItem>
-               <ComboBoxItem Tag="P">Percent</ComboBoxItem>
-            </ComboBox>
-            <TextBlock Text="Precision: " Grid.Row="3" VerticalAlignment="Center"  Visibility="{Binding SelectedItem.Tag, ElementName=_formatString, Converter={StaticResource formatStringToVisibilityConverter}}" />
-            <xctk:IntegerUpDown x:Name="_precision" Grid.Row="3" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" Visibility="{Binding SelectedItem.Tag, ElementName=_formatString, Converter={StaticResource formatStringToVisibilityConverter}}" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
-
-            <TextBlock Grid.Column="2" Text="Increment:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-            <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-            <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum:" VerticalAlignment="Center" Margin="20,0,0,0"/>
-            <xctk:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
-            <xctk:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
-            <xctk:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <xctk:CalculatorUpDown Margin="10" Width="250" 
-                                Increment="{Binding Value, ElementName=_increment}"
-                                Maximum="{Binding Value, ElementName=_maximum}"
-                                Minimum="{Binding Value, ElementName=_minimum}"
-                                Precision="{Binding Value, ElementName=_precision}" 
-                                FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
-                                Watermark="{Binding Text, ElementName=_watermark}"
-                                EnterClosesCalculator="{Binding IsChecked, ElementName=_enterClosesCalculator}"/>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs
deleted file mode 100644
index cb2028a83..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorUpDownView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Calculator.Views
-{
-  /// <summary>
-  /// Interaction logic for CalculatorUpDownView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class CalculatorUpDownView : DemoView
-  {
-    public CalculatorUpDownView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml
deleted file mode 100644
index 04c7104cc..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml
+++ /dev/null
@@ -1,55 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Calculator"
-                 Description="The Calculator is a control used for performing mathematical calculations.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Precision: " VerticalAlignment="Center" />
-            <xctk:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0" />
-         <xctk:Calculator Margin="10" Width="250" Precision="{Binding Value, ElementName=_precision}" />
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs
deleted file mode 100644
index 15184e052..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Calculator/Views/CalculatorView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Calculator.Views
-{
-  /// <summary>
-  /// Interaction logic for CalculatorView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class CalculatorView : DemoView
-  {
-    public CalculatorView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs
deleted file mode 100644
index b61760cc6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/CheckListsModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.CheckLists.Views;
-
-namespace Samples.Modules.CheckLists
-{
-  public class CheckListsModule : ModuleBase
-  {
-    public CheckListsModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs
deleted file mode 100644
index 094cb011c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit CheckLists Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit CheckLists Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj
deleted file mode 100644
index 92eb38ebd..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Samples.Modules.CheckLists.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.CheckLists</RootNamespace>
-    <AssemblyName>Samples.Modules.CheckLists</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="CheckListsModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml
deleted file mode 100644
index 3e9b0c23c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml
+++ /dev/null
@@ -1,176 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.CheckLists.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 x:Name="demo"
-                 Title="Check Lists"
-                 Description="The CheckListBox and CheckComboBox controls represent a list of selected items that are displayed as CheckBoxes. Besides the common SelectedItem and SelectedItems properties, these controls give developers more alternatives for managing and handling selections.">
-   <sample:DemoView.Resources>
-      <x:Array x:Key="personProperties" Type="s:String">
-         <s:String>ID</s:String>
-         <s:String>FirstName</s:String>
-         <s:String>LastName</s:String>
-      </x:Array>
-   </sample:DemoView.Resources>
-
-   <Grid >
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition />
-               <RowDefinition />
-               <RowDefinition />
-               <RowDefinition />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="*"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Grid.Row="0" Grid.Column="0" 
-                       Text="Delimiter:" 
-                       Margin="5"/>
-            <TextBox x:Name="_delimiter" 
-                     Grid.Row="0" Grid.Column="1"
-                     Margin="5"
-                     HorizontalAlignment="Stretch"
-                     Text="," />
-
-            <TextBlock Grid.Row="1" Grid.Column="0" 
-                       Text="ValueMemberPath:" 
-                       Margin="5"/>
-            <ComboBox x:Name="_valueMemberPath" 
-                     Grid.Row="1" Grid.Column="1"
-                     HorizontalAlignment="Stretch"
-                     Margin="5"
-                     ItemsSource="{StaticResource personProperties}" 
-                     SelectedIndex="0"/>
-
-            <TextBlock Grid.Row="2" Grid.Column="0" 
-                       Text="SelectedValue:" 
-                       Margin="5"/>
-            <TextBox x:Name="_selectedValue" 
-                     Grid.Row="2" Grid.Column="1"
-                     Margin="5"
-                     HorizontalAlignment="Stretch"
-                     Text="{Binding ElementName=_checkListBox, Path=SelectedValue, Mode=TwoWay}"/>
-
-            <TextBlock Grid.Row="0" Grid.Column="2" 
-                       Text="SelectedMemberPath:" 
-                       Margin="5"/>
-            <TextBox x:Name="_selectedMemberPath" 
-                     Grid.Row="0" Grid.Column="3"
-                     Margin="5"
-                     HorizontalAlignment="Stretch"
-                     IsEnabled="False"
-                     Text="IsSelected" />
-
-            <TextBlock Grid.Row="1" Grid.Column="2" 
-                       Text="DisplayMemberPath:" 
-                       Margin="5"/>
-            <ComboBox x:Name="_displayMemberPath" 
-                     Grid.Row="1" Grid.Column="3"
-                     Margin="5"
-                     HorizontalAlignment="Stretch"
-                     ItemsSource="{StaticResource personProperties}"
-                     SelectedIndex="1"/>
-            <TextBlock Grid.Row="2" Grid.Column="2" 
-                       Text="IsDropDownOpen:" 
-                       Margin="5"/>
-            <CheckBox x:Name="_isDropDownOpen" 
-                     Grid.Row="2" Grid.Column="3"
-                     Margin="5"
-                     HorizontalAlignment="Stretch"
-                     Content="(CheckComboBox only)"
-                     ClickMode="Press"
-                     IsChecked="{Binding IsDropDownOpen, ElementName=_checkComboBox}" />
-            <TextBlock Grid.Row="3" Grid.Column="2" 
-                       Text="MaxDropDownHeight:" 
-                       Margin="5"/>
-            <StackPanel Orientation="Horizontal"
-                        Grid.Row="3" Grid.Column="3"
-                        HorizontalAlignment="Stretch"
-                        Margin="5">
-                <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
-                                   Width="45" 
-                                   Value="{Binding MaxDropDownHeight, ElementName=_checkComboBox}"
-                                   DefaultValue="150"
-                                   AllowInputSpecialValues="PositiveInfinity"
-                                   Minimum="0"/>
-                <TextBlock Text="(CheckComboBox only)" 
-                           Margin="4"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-
-      <GroupBox Header="Item Models" Grid.Row="1" Margin="5">
-         <ListBox DisplayMemberPath="ModelDisplay" FontFamily="Global Monospace"
-                  ItemsSource="{Binding}"/>
-      </GroupBox>
-
-      <Grid Grid.Row="2">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-         </Grid.RowDefinitions>
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="*" />
-         </Grid.ColumnDefinitions>
-
-         <TextBlock Text="CheckListBox Usage:" Margin="5" Style="{StaticResource Header}" />
-         <xctk:CheckListBox x:Name="_checkListBox"
-                            Grid.Column="0"
-                            Grid.Row="1"
-                            Margin="5"
-                            VerticalAlignment="Stretch"
-                            ItemsSource="{Binding}"
-                            Delimiter="{Binding ElementName=_delimiter, Path=Text}"
-                            ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
-                            SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
-                            DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" />
-
-         <TextBlock Text="CheckComboBox Usage:" Grid.Column="1" Margin="5" Style="{StaticResource Header}"/>
-         <xctk:CheckComboBox Grid.Column="1"
-                             x:Name="_checkComboBox"
-                             Grid.Row="1"
-                             Margin="5"
-                             VerticalAlignment="Top"
-                             ItemsSource="{Binding}"
-                             Delimiter="{Binding ElementName=_delimiter, Path=Text}"
-                             ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
-                             SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
-                             DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" 
-                             IsDropDownOpen="false"
-                             MaxDropDownHeight="100"/>
-        </Grid>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs
deleted file mode 100644
index f25cd72e3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.CheckLists.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-      this.DataContext = new List<Person>()
-      {
-        new Person(){ID=101, FirstName="John", LastName="Smith"},
-        new Person(){ID=102, FirstName="Janel", LastName="Leverling"},
-        new Person(){ID=103, FirstName="Laura", LastName="Callahan"},
-        new Person(){ID=104, FirstName="Robert", LastName="King"},
-        new Person(){ID=105, FirstName="Margaret", LastName="Peacock"},
-        new Person(){ID=106, FirstName="Andrew", LastName="Fuller"},
-        new Person(){ID=107, FirstName="Anne", LastName="Dodsworth"},
-        new Person(){ID=108, FirstName="Nancy", LastName="Davolio"},
-        new Person(){ID=109, FirstName="Naomi", LastName="Suyama"},
-      };
-    }
-
-  }
-
-  public class Person : INotifyPropertyChanged
-  {
-    private bool _isSelected;
-    private int _ID;
-    private string _firstName;
-    private string _lastName;
-
-    public bool IsSelected
-    {
-      get
-      {
-        return _isSelected;
-      }
-      set
-      {
-        _isSelected = value;
-        OnPropertyChanged( "IsSelected" );
-      }
-    }
-
-    public int ID
-    {
-      get
-      {
-        return _ID;
-      }
-      set
-      {
-        _ID = value;
-        OnPropertyChanged( "ID" );
-      }
-    }
-
-    public string FirstName
-    {
-      get
-      {
-        return _firstName;
-      }
-      set
-      {
-        _firstName = value;
-        OnPropertyChanged( "FirstName" );
-      }
-    }
-
-    public string LastName
-    {
-      get
-      {
-        return _lastName;
-      }
-      set
-      {
-        _lastName = value;
-        OnPropertyChanged( "LastName" );
-      }
-    }
-
-    public string ModelDisplay
-    {
-      get
-      {
-        string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20);
-        return string.Format(
-          "ID={0}: Name= {1}, IsSelected= {2}",
-          ID,
-          completeName,
-          IsSelected );
-      }
-    }
-
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected void OnPropertyChanged( string propertyName )
-    {
-      if( PropertyChanged != null )
-      {
-        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-        PropertyChanged( this, new PropertyChangedEventArgs( "ModelDisplay" ) );
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml
deleted file mode 100644
index fa613eb82..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.CheckLists.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.CheckLists.Views"
-              Header="Check lists" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs
deleted file mode 100644
index 6402721c8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.CheckLists/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.CheckLists.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
deleted file mode 100644
index 5b998131d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.ChildWindow.Views;
-
-namespace Samples.Modules.ChildWindow
-{
-  public class ChildWindowModule : ModuleBase
-  {
-    public ChildWindowModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Converters/IntToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Converters/IntToBoolConverter.cs
deleted file mode 100644
index ea77743e2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Converters/IntToBoolConverter.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-
-namespace Samples.Modules.ChildWindow.Converters
-{
-  class IntToBoolConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      int intReceived = (int)value;
-
-      if( intReceived == 1 )
-        return false;
-      else
-        return true;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
deleted file mode 100644
index 7ddc404a0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit ChildWindow Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit ChildWindow Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj
deleted file mode 100644
index 8b38c9060..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Samples.Modules.ChildWindow.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{44733C25-7F22-4B91-83C7-4E654063DFD6}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.ChildWindow</RootNamespace>
-    <AssemblyName>Samples.Modules.ChildWindow</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ChildWindowModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-    <Compile Include="Converters\IntToBoolConverter.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
deleted file mode 100644
index d7ae1097d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
+++ /dev/null
@@ -1,133 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.ChildWindow.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:conv="clr-namespace:Samples.Modules.ChildWindow.Converters"
-                 Title="ChildWindow"
-                 Description="The ChildWindow can be used to create a window that is displayed within the bounds of a specific parent container.">
-
-   <sample:DemoView.Resources>
-      <conv:IntToBoolConverter x:Key="IntToBoolConverter" />
-
-      <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:WindowState" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="WindowStartupLocations" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:WindowStartupLocation" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </sample:DemoView.Resources>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Caption:" Margin="2" VerticalAlignment="Center" />
-            <TextBox Name="_txtCaption" Grid.Column="1" Margin="5" Text="ChildWindow" VerticalAlignment="Center" />
-
-            <TextBlock Grid.Row="1" Name="textBlock2" Text="Left:" Margin="2" VerticalAlignment="Center" />
-            <xctk:DoubleUpDown x:Name="_txtLeft" Grid.Column="1" Grid.Row="1" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
-
-            <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" />
-            <xctk:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
-
-            <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-            <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
-
-            <TextBlock Grid.Row="1" Text="WindowStartupLocation:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-            <ComboBox Grid.Column="3" Grid.Row="1" Name="_cboWindowStartupLocations" ItemsSource="{Binding Source={StaticResource WindowStartupLocations}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowState, Converter={StaticResource IntToBoolConverter}}"/>
-
-            <TextBlock Grid.Row="2" Text="WindowState:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-            <ComboBox Grid.Column="3" Grid.Row="2" Name="_cboWindowState" ItemsSource="{Binding Source={StaticResource WindowStates}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" />
-
-         </Grid>
-      </GroupBox>
-
-      <Grid Grid.Row="1" Margin="10">
-         <xctk:ChildWindow x:Name="_childWindow"
-                           Width="350"
-                           Caption="{Binding Text, ElementName=_txtCaption}"
-                           IsModal="{Binding IsChecked, ElementName=_chkIsModal}"
-                           Left="{Binding Value, ElementName=_txtLeft, Mode=TwoWay}"
-                           Top="{Binding Value, ElementName=_txtTop, Mode=TwoWay}"
-                           WindowStartupLocation="{Binding SelectedItem, ElementName=_cboWindowStartupLocations}" 
-                           WindowState="{Binding SelectedItem, ElementName=_cboWindowState}">
-            <Grid Margin="10" >
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
-               <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
-
-               <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
-               <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
-
-               <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
-               <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
-
-               <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
-               <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
-
-               <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
-               <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
-
-               <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-                  <Button Width="65" Margin="2">OK</Button>
-                  <Button Width="65" Margin="2">Cancel</Button>
-               </StackPanel>
-            </Grid>
-         </xctk:ChildWindow>
-      </Grid>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
deleted file mode 100644
index aedd4c2c9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-
-namespace Samples.Modules.ChildWindow.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
deleted file mode 100644
index c1ddcfd9c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.ChildWindow.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.ChildWindow.Views"
-              Header="ChildWindow" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
deleted file mode 100644
index be23e1eb3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.ChildWindow.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
deleted file mode 100644
index c8265cf6d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Color.Views;
-
-namespace Samples.Modules.Color
-{
-  public class ColorModule : ModuleBase
-  {
-    public ColorModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
deleted file mode 100644
index ab620f6f5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Color Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Color Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj
deleted file mode 100644
index 93cbe7527..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Samples.Modules.Color.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A36AB9C9-D813-4018-B341-8729A9B5BD7D}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Color</RootNamespace>
-    <AssemblyName>Samples.Modules.Color</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ColorModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
deleted file mode 100644
index 241bafbf0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
+++ /dev/null
@@ -1,190 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Color.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Color Controls"
-                 Description="The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.">
-    <sample:DemoView.Resources>
-         <Style x:Key="controlInError" TargetType="xctk:IntegerUpDown">
-            <Style.Triggers>
-                <Trigger Property="Validation.HasError" Value="true">
-                    <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
-                            Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-    </sample:DemoView.Resources>
-   <Grid >
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="*"/>
-         <ColumnDefinition Width="*"/>
-      </Grid.ColumnDefinitions>
-
-      <Grid Grid.Column="0" Margin="5">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0" Grid.Row="0"
-            Header="ColorCanvas Features"
-            HorizontalAlignment="Stretch" >
-            <Grid>
-               <Grid.Resources>
-                  <Style x:Key="alignStyle" TargetType="{x:Type FrameworkElement}">
-                     <Setter Property="Margin" Value="5"/>
-                  </Style>
-
-                  <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource alignStyle}"/>
-                  <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource alignStyle}"/>
-                  <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource alignStyle}" />                  
-                  <Style TargetType="{x:Type xctk:IntegerUpDown}" BasedOn="{StaticResource alignStyle}">
-                     <Setter Property="Width" Value="45"/>
-                     <Setter Property="Minimum" Value="0" />
-                     <Setter Property="Maximum" Value="255" />
-                  </Style>                     
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="*"/>
-               </Grid.ColumnDefinitions>
-
-               <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
-                           HorizontalAlignment="Stretch"
-                           Orientation="Horizontal" >
-                  <TextBlock Text="R:"/>
-                  <xctk:IntegerUpDown x:Name="_R" Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
-                  <TextBlock Text="G:" Margin="5"/>
-                  <xctk:IntegerUpDown x:Name="_G" Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
-                  <TextBlock Text="B:" Margin="5"/>
-                  <xctk:IntegerUpDown x:Name="_B" Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
-                  <TextBlock Text="A:" Margin="5"/>
-                  <xctk:IntegerUpDown x:Name="_A" Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
-               </StackPanel>
-
-               <TextBlock Grid.Column="0" Grid.Row="1" Text="UsingAlphaChannel: " />
-               <CheckBox Grid.Column="1" Grid.Row="1" x:Name="_usingAlphaChannel" 
-                         IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0" Grid.Row="2" Text="HexadecimalString: " />
-               <TextBox Grid.Column="1" Grid.Row="2"  IsEnabled="False" 
-                        Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}"/>
-            </Grid>
-         </GroupBox>
-
-         <TextBlock Text="ColorCanvas Usage: " Grid.Row="1" Margin="0,10,0,0" Style="{StaticResource Header}" />
-         <xctk:ColorCanvas x:Name="_colorCanvas" Grid.Row="2" 
-                           VerticalAlignment="Top"
-                           HorizontalAlignment="Stretch" />
-
-      </Grid>
-
-      <Grid Grid.Column="1" Margin="5">
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="*"/>
-         </Grid.RowDefinitions>
-
-         <GroupBox Grid.Column="0" Grid.Row="0"
-            Header="ColorPicker Features"
-            HorizontalAlignment="Stretch"
-            Margin="10">
-            <Grid>
-               <Grid.Resources>
-                  <Style TargetType="{x:Type TextBlock}">
-                     <Setter Property="Margin" Value="3" />
-                     <Setter Property="VerticalAlignment" Value="Center" />
-                  </Style>
-                  <Style TargetType="{x:Type TextBox}">
-                     <Setter Property="Margin" Value="3"/>
-                  </Style>
-                  <Style TargetType="{x:Type CheckBox}">
-                     <Setter Property="Margin" Value="3"/>
-                  </Style>
-               </Grid.Resources>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto"/>
-                  <ColumnDefinition Width="*"/>
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Grid.Column="0" Grid.Row="0" Text="AvailableColorsHeader:" />
-               <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0" Grid.Row="1" Text="RecentColorsHeader:" />
-               <TextBox Grid.Column="1" Grid.Row="1" Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
-               <TextBlock Grid.Column="0" Grid.Row="2" Text="StandardColorsHeader:" />
-               <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
-
-               <CheckBox Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" 
-                         Content="DisplayColorAndName" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" 
-                         Content="IsOpen" 
-                         ClickMode="Press"
-                         IsChecked="{Binding ElementName=_colorPicker, Path=IsOpen, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" 
-                         Content="ShowAdvancedButton" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAdvancedButton, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" 
-                         Content="ShowAvailableColors" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2" 
-                         Content="ShowDropDownButton" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="2" 
-                         Content="ShowRecentColors" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2" 
-                         Content="ShowStandardColors" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}"/>
-               <CheckBox Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="2" 
-                         Content="UsingAlphaChannel" 
-                         IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}"/>
-               <TextBlock Grid.Column="0" Grid.Row="11" Text="SelectedColorText:" />
-               <TextBox Grid.Column="1" Grid.Row="11" IsEnabled="False" Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
-            </Grid>
-         </GroupBox>
-
-         <TextBlock Text="ColorPicker Usage: " Grid.Row="1"  Style="{StaticResource Header}" />
-         <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" VerticalAlignment="Top"/>
-      </Grid>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
deleted file mode 100644
index bd0cecf33..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Color.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
deleted file mode 100644
index d24281212..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Color.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Color.Views"
-              Header="Color" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
deleted file mode 100644
index 60ddd5a90..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Color.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/DataGridModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/DataGridModule.cs
deleted file mode 100644
index 739d1bd76..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/DataGridModule.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.DataGrid.Views;
-
-namespace Samples.Modules.DataGrid
-{
-  public class DataGridModule : ModuleBase
-  {
-    public DataGridModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-      Container.RegisterNavigationType( typeof( FullVersion ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Properties/AssemblyInfo.cs
deleted file mode 100644
index b629e1247..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit DataGrid Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit DataGrid Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Samples.Modules.DataGrid.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Samples.Modules.DataGrid.csproj
deleted file mode 100644
index 4eaeeaf90..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Samples.Modules.DataGrid.csproj
+++ /dev/null
@@ -1,121 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{129477D9-F413-495F-BE05-D049575BC16C}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.DataGrid</RootNamespace>
-    <AssemblyName>Samples.Modules.DataGrid</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.DataGrid.Samples.SampleData">
-      <HintPath>..\..\..\..\Libs\Xceed.Wpf.DataGrid.Samples.SampleData.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DataGridModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="UniqueIDCellValidationRule.cs" />
-    <Compile Include="Views\FullVersion.xaml.cs">
-      <DependentUpon>FullVersion.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj">
-      <Project>{63648392-6CE9-4A60-96D4-F9FD718D29B0}</Project>
-      <Name>Xceed.Wpf.DataGrid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\FullVersion.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml
deleted file mode 100644
index 14b74b2c2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.DataGrid.Views.FullVersion"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                 xmlns:compModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-                 Title="Full Version" >
-    <StackPanel>
-        <RichTextBox IsReadOnly="True" IsDocumentEnabled="False" BorderThickness="0">
-            <FlowDocument>
-                <Paragraph>
-                    The full-featured version of the DataGrid available commercially provides
-               additional features such as the following:
-                </Paragraph>
-                <List>
-                    <ListItem>
-                        <Paragraph>Master-Detail</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Filter row</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Insertion row</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Excel auto-filtering</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Column chooser</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>CardView, CompactCardView</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>3DView, MultiSurfaceView</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Statistical functions and summary row</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Print, print preview</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Export to Excel</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Fixed column splitter UI element</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Persist user settings</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Design-time support in Visual Studio and Expression Blend</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Comprehensive documentation fully integrated into Visual Studio</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>A variety of VB.NET and C# sample applications to get you started</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Office 2007 themes: Blue, Black, and Silver</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>The Xceed Live Explorer theme</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>Xceed 3D Views for WPF is included</Paragraph>
-                    </ListItem>
-                    <ListItem>
-                        <Paragraph>And much more!</Paragraph>
-                    </ListItem>
-                </List>
-            </FlowDocument>
-        </RichTextBox>
-
-        <TextBlock Margin="0,20,0,0">
-         <Hyperlink NavigateUri="http://www.xceed.com/Grid_WPF_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
-            Click here for more details about the full-featured DataGrid control.
-         </Hyperlink>
-        </TextBlock>
-    </StackPanel>
-
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml.cs
deleted file mode 100644
index 06fcdf642..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/FullVersion.xaml.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using Xceed.Wpf.DataGrid.Samples.SampleData;
-using System.Data;
-using Xceed.Wpf.DataGrid;
-using System.Diagnostics;
-
-namespace Samples.Modules.DataGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for FullVersion.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class FullVersion : DemoView
-  {
-    public FullVersion()
-    {
-      InitializeComponent();
-    }
-
-    private void Hyperlink_RequestNavigate( object sender, System.Windows.Navigation.RequestNavigateEventArgs e )
-    {
-      Process.Start( new ProcessStartInfo( e.Uri.AbsoluteUri ) );
-      e.Handled = true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml
deleted file mode 100644
index 98352f542..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml
+++ /dev/null
@@ -1,67 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.DataGrid.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                 xmlns:compModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
-                 xmlns:local="clr-namespace:Samples.Modules.DataGrid"
-                 Title="DataGrid" 
-                 x:Name="_demo">
-    <sample:DemoView.Description>
-        The experience that Xceed DataGrid for WPF provides centers on its Tableflow view, which lets you take advantage of a stunning, shaded appearance and capabilities such as inertial smooth scrolling and animated full-column reordering—which mimics the physics of real-life movement. Add to that the datagrid’s zero-lag data virtualization, and you have the fastest WPF datagrid around—in performance and feel.
-
-It's rock-solid and time-tested, so you can trust it in your most important applications. Constantly evolving—no other datagrid is updated as often—it has more features than any other offering and a flexible, extensible object model. It also provides unbeatable performance by handling millions of rows and thousands of columns, and integrates easily into any WPF app. It’s easy to understand why it’s the most-adopted WPF datagrid available and used by Microsoft in Visual Studio 2010 and by IBM U2 in SystemBuilder 4GL (SB+)!
-
-Note: The datagrid included in Xceed Extended WPF Toolkit Plus contains a subset of the features of Xceed DataGrid for WPF.
-
-    </sample:DemoView.Description>
-    <Grid>
-        <Grid.Resources>
-            <xcdg:DataGridCollectionViewSource x:Key="cvsOrders"
-                                            Source="{Binding ElementName=_demo, Path=Orders}">
-                <xcdg:DataGridCollectionViewSource.GroupDescriptions>
-                    <PropertyGroupDescription PropertyName="ShipCountry" />
-                    <PropertyGroupDescription PropertyName="ShipCity" />
-                </xcdg:DataGridCollectionViewSource.GroupDescriptions>
-            </xcdg:DataGridCollectionViewSource>
-        </Grid.Resources>
-
-        <xcdg:DataGridControl x:Name="_dataGrid" 
-                            MaxHeight="400"
-                            ItemsSource="{Binding Source={StaticResource cvsOrders}}" >
-            <xcdg:DataGridControl.View>
-                <xcdg:TableflowView FixedColumnCount="2" />
-            </xcdg:DataGridControl.View>
-
-            <xcdg:DataGridControl.Columns>
-                <!--Preconfigure the OrderID Column of the grid with CellValidationRule. -->
-                <xcdg:Column FieldName="OrderID"
-                         IsMainColumn="True">
-                    <xcdg:Column.CellValidationRules>
-                        <local:UniqueIDCellValidationRule />
-                    </xcdg:Column.CellValidationRules>
-                </xcdg:Column>
-            </xcdg:DataGridControl.Columns>
-        </xcdg:DataGridControl>
-    </Grid>
-
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml.cs
deleted file mode 100644
index 4c56b5e3a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using Xceed.Wpf.DataGrid.Samples.SampleData;
-using System.Data;
-using Xceed.Wpf.DataGrid;
-
-namespace Samples.Modules.DataGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      this.Orders = DataProvider.GetNorthwindDataSet().Tables[ "Orders" ];
-      InitializeComponent();
-    }
-
-    public DataTable Orders
-    {
-      get;
-      private set;
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml
deleted file mode 100644
index ae1a7d56b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.DataGrid.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.DataGrid.Views"
-              Header="DataGrid" Tag="{x:Type views:HomeView}"
-              Style="{StaticResource newFeature}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-   <TreeViewItem Header="Full Version" Tag="{x:Type views:FullVersion}" />
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml.cs
deleted file mode 100644
index 42995634c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.DataGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs
deleted file mode 100644
index 039ba8cef..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Converters/DateTimeToTimeSpanConverter.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-
-namespace Samples.Modules.DateTime.Converters
-{
-  public class DateTimeToTimeSpanConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( value is System.DateTime )
-      {
-        System.DateTime time = (System.DateTime)value;
-        return new TimeSpan( time.Hour, time.Minute, 0 );
-      }
-      return value;
-    }
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
deleted file mode 100644
index 14119fad2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.DateTime.Views;
-
-namespace Samples.Modules.DateTime
-{
-  public class DateTimeModule : ModuleBase
-  {
-    public DateTimeModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
deleted file mode 100644
index 178cbedbb..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit DateTime Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit DateTime Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj
deleted file mode 100644
index 54ad641c8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Samples.Modules.DateTime.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.DateTime</RootNamespace>
-    <AssemblyName>Samples.Modules.DateTime</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Converters\DateTimeToTimeSpanConverter.cs" />
-    <Compile Include="DateTimeModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
deleted file mode 100644
index 3e8098031..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
+++ /dev/null
@@ -1,132 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-
-<sample:DemoView x:Class="Samples.Modules.DateTime.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:conv="clr-namespace:Samples.Modules.DateTime.Converters"
-                 Title="DateTime Controls"
-                 Description="The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.">
-    <sample:DemoView.Resources>
-        <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
-
-        <ObjectDataProvider x:Key="enumTimeFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="xctk:TimeFormat"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimeFormat"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </sample:DemoView.Resources>
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
-        </Grid.ColumnDefinitions>
-
-      <GroupBox Header="Features" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" >
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Format:" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
-            <ComboBox x:Name="_format" Grid.Row="0" Grid.Column="1" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="200" Margin="5,5,25,5"/>
-            <TextBlock Text="FormatString:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
-            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="200" Margin="5,5,25,5"/>
-            <TextBlock Text="Watermark:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"/>
-            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Text="Enter Text" Width="200" VerticalAlignment="Center" Margin="5,5,25,5"/>            
-
-            <TextBlock Text="TimeFormat:" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumTimeFormatData}}" Width="200" Margin="5"/>
-            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" />
-            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="200" Margin="5"/>            
-            <TextBlock Text="TimeWatermark:" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"/>
-            <TextBox x:Name="_timeWatermark" Grid.Row="2" Grid.Column="3" Text="Enter Text" Width="200" VerticalAlignment="Center" Margin="5"/>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
-            <TextBlock Text="DateTimePicker Usage: " Margin="0,10,0,0" Style="{StaticResource Header}" />
-            <xctk:DateTimePicker x:Name="_datetimePicker"
-                                 Width="300"
-                                 VerticalAlignment="Top"
-                                 IsReadOnly="False"
-                                 Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_formatString}"
-                                 Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
-                                 TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"/>
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch">
-            <GroupBox Header="TimePicker Features" Margin="0,15,0,0">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Text="StartTime:" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_startTime" Grid.Column="1" Format="ShortTime" Value="9:00" Width="100" Margin="5"/>
-                    <TextBlock Text="EndTime:" Grid.Row="1" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_endTime" Grid.Row="1" Grid.Column="1" Format="ShortTime" Value="17:00" Width="100" Margin="5"/>
-                    <TextBlock Text="TimeInterval:" Grid.Row="2" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_timeInterval" Grid.Row="2" Grid.Column="1" Format="Custom" FormatString="H:mm" Value="0:30" Width="100" Margin="5"/>
-                </Grid>
-            </GroupBox>
-
-            <StackPanel>
-                <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
-                <xctk:TimePicker x:Name="_timePicker"
-                                 VerticalAlignment="Top"
-                                 Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
-                                 StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"/>
-         </StackPanel>
-        </StackPanel>
-    </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
deleted file mode 100644
index bcd2759b8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.DateTime.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
deleted file mode 100644
index 2654e6dce..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.DateTime.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.DateTime.Views"
-              Header="DateTime" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
deleted file mode 100644
index 57156adf2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.DateTime.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs
deleted file mode 100644
index 49f2e619a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/ColorConverter.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows.Media;
-
-namespace Samples.Modules.Magnifier.Converters
-{
-  class ColorConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( (value != null) && value is Color )
-        return new SolidColorBrush( (Color)value );
-
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs
deleted file mode 100644
index a0afac5d8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Converters/VisibilityConverter.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit;
-using System.Windows;
-
-namespace Samples.Modules.Magnifier.Converters
-{
-  class VisibilityConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value is FrameType )
-      {
-        FrameType frameType = (FrameType)value;
-        int param = int.Parse((string)parameter);
-        switch( frameType )
-        {
-          case FrameType.Circle:
-            {
-              //For the radius
-              if( param == 0 )
-                return Visibility.Visible;
-              //For the rectangle
-              else if( param == 1 )
-                return Visibility.Collapsed;
-            }
-            break;
-          case FrameType.Rectangle:
-            {
-              //For the radius
-              if( param == 0 )
-                return Visibility.Collapsed;
-              //For the rectangle
-              else if( param == 1 )
-                return Visibility.Visible;
-            }
-            break;
-        }
-      }
-
-      return value;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs
deleted file mode 100644
index e44ea1ca2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/MagnifierModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Magnifier.Views;
-
-namespace Samples.Modules.Magnifier
-{
-  public class MagnifierModule : ModuleBase
-  {
-    public MagnifierModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs
deleted file mode 100644
index aec6a3834..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-﻿using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Magnifier Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Magnifier Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj
deleted file mode 100644
index ad9f18421..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Samples.Modules.Magnifier.csproj
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Magnifier</RootNamespace>
-    <AssemblyName>Samples.Modules.Magnifier</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Converters\ColorConverter.cs" />
-    <Compile Include="Converters\VisibilityConverter.cs" />
-    <Compile Include="MagnifierModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-    <Resource Include="Resources\SampleText.rtf" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml
deleted file mode 100644
index 8cdf1e5f8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml
+++ /dev/null
@@ -1,97 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-
-<sample:DemoView x:Class="Samples.Modules.Magnifier.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:conv="clr-namespace:Samples.Modules.Magnifier.Converters"
-                 Title="Magnifier"
-                 Description="The Magnifier control allows the user to magnify parts of an application.">
-    <sample:DemoView.Resources>
-        <conv:ColorConverter x:Key="colorConverter" />
-        <conv:VisibilityConverter x:Key="visibilityConverter" />
-        <xctk:RtfFormatter x:Key="rtfFormatter" />
-
-        <ObjectDataProvider x:Key="enumData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="xctk:FrameType"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-    </sample:DemoView.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-
-        <GroupBox Header="Features" Grid.Row="0" Margin="5">
-            <Grid Margin="5" HorizontalAlignment="Left">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="Zoom Factor:" VerticalAlignment="Center" Margin="5" />
-                <xctk:DoubleUpDown x:Name="_zoomFactor" Grid.Column="1" Value="0.4" Minimum="0" Increment="0.1" Maximum="3" FormatString="N1" Width="150" Margin="5" />
-                <TextBlock Text="Border Thickness:" Grid.Row="1" VerticalAlignment="Center" Margin="5" />
-                <xctk:IntegerUpDown x:Name="_borderThickness" Grid.Row="1" Grid.Column="1" Value="2" Minimum="0" Maximum="20" Width="150" Margin="5" />
-                <TextBlock Text="Border Brush:" Grid.Row="2" VerticalAlignment="Center" Margin="5"/>
-                <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" SelectedColor="Green"/>
-                <TextBlock Grid.Column="2" Text="Frame Type:" VerticalAlignment="Center" />
-                <ComboBox x:Name="_frameType" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumData}}" Grid.Column="3" Width="150" Margin="5" />
-                <TextBlock Text="Radius:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" VerticalAlignment="Center" />
-                <xctk:DoubleUpDown x:Name="_radius" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" Grid.Row="1" Grid.Column="3" Value="80"  Minimum="0" Maximum="150" Width="150" Margin="5"  />
-                <TextBlock Text="RectangleWidth:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" />
-                <xctk:DoubleUpDown x:Name="_width" Grid.Row="1" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
-                <TextBlock Text="RectangleHeight:" Grid.Row="2" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" />
-                <xctk:DoubleUpDown  x:Name="_height" Grid.Row="2" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left" >
-            <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
-            <xctk:RichTextBox x:Name="_txtContent"
-                              IsReadOnly="True" 
-                              TextFormatter="{StaticResource rtfFormatter}" 
-                              FontSize="10" >
-                    <xctk:MagnifierManager.Magnifier>
-                        <xctk:Magnifier x:Name="_magnifier"
-                                        Background="White"
-                                        Radius="{Binding Source={x:Reference _radius}, Path=Value}"
-                                        ZoomFactor="{Binding Source={x:Reference _zoomFactor}, Path=Value}"
-                                        FrameType="{Binding Source={x:Reference _frameType}, Path=SelectedItem}"
-                                        BorderBrush="{Binding Source={x:Reference _colorPicker}, Path=SelectedColor, Converter={StaticResource colorConverter}}"
-                                        BorderThickness="{Binding Source={x:Reference _borderThickness}, Path=Value}"
-                                        Width="{Binding Source={x:Reference _width}, Path=Value, Mode=TwoWay}"
-                                        Height="{Binding Source={x:Reference _height}, Path=Value, Mode=TwoWay}" />
-                    </xctk:MagnifierManager.Magnifier>
-            </xctk:RichTextBox>
-        </StackPanel>
-    </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs
deleted file mode 100644
index 2b196426b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Resources;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Magnifier.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-
-      // Load and display the RTF file.
-      Uri uri = new Uri( "pack://application:,,,/Samples.Modules.Magnifier;component/Resources/SampleText.rtf" );
-      StreamResourceInfo info = Application.GetResourceStream( uri );
-      using( StreamReader txtReader = new StreamReader( info.Stream ) )
-      {
-        _txtContent.Text = txtReader.ReadToEnd();
-      }
-    }
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml
deleted file mode 100644
index cdb905c77..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Magnifier.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Magnifier.Views"
-              Header="Magnifier" Tag="{x:Type views:HomeView}">
-
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs
deleted file mode 100644
index 636d9f6c9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Magnifier.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs
deleted file mode 100644
index 343a520df..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/MessageBoxModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.MessageBox.Views;
-
-namespace Samples.Modules.MessageBox
-{
-  public class MessageBoxModule : ModuleBase
-  {
-    public MessageBoxModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs
deleted file mode 100644
index 10a2a0319..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit MessageBox Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit MessageBox Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj
deleted file mode 100644
index 5bd2ec095..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Samples.Modules.MessageBox.csproj
+++ /dev/null
@@ -1,101 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{C324395B-C1D1-407B-8745-4AAC39B8BFD9}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.MessageBox</RootNamespace>
-    <AssemblyName>Samples.Modules.MessageBox</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="MessageBoxModule.cs" />
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml
deleted file mode 100644
index 627832e01..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml
+++ /dev/null
@@ -1,182 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.MessageBox.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="MessageBox"
-                 Description="This extended MessageBox allows you to customize and style various aspects of the control.">
-   <sample:DemoView.Resources>
-      <LinearGradientBrush x:Key="buttonRegionBackground" StartPoint="0,0" EndPoint="1,1">
-         <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-               <GradientStop Offset="0" Color="#FF3D3D3D" />
-               <GradientStop Offset="1" Color="#FF000000" />
-            </GradientStopCollection>
-         </LinearGradientBrush.GradientStops>
-      </LinearGradientBrush>
-
-      <SolidColorBrush x:Key="MyButtonHoverBrush" Color="#FFD23C93" />
-      <SolidColorBrush x:Key="MyButtonPressedBrush" Color="#FF841B5D" />
-
-      <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-            <GradientStop Color="#FFA3AEB9" Offset="0" />
-            <GradientStop Color="#FF8399A9" Offset="0.375" />
-            <GradientStop Color="#FF718597" Offset="0.375" />
-            <GradientStop Color="#FF617584" Offset="1" />
-        </LinearGradientBrush>
-
-      <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-            <LinearGradientBrush.GradientStops>
-                <GradientStopCollection>
-                    <GradientStop Offset="0" Color="#FFb5bdc8" />
-                    <GradientStop Offset="0.370" Color="#FF8399a9" />
-                    <GradientStop Offset="0.370" Color="#FF718597" />
-                    <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-                    <GradientStop Offset="1" Color="#FFb9c1ca" />
-                </GradientStopCollection>
-            </LinearGradientBrush.GradientStops>
-        </LinearGradientBrush>
-
-      <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-            <LinearGradientBrush.GradientStops>
-                <GradientStopCollection>
-                    <GradientStop Offset="0" Color="#FF6b7c8d" />
-                    <GradientStop Offset="0.370" Color="#FF4d606f" />
-                    <GradientStop Offset="0.370" Color="#FF465460" />
-                    <GradientStop Offset="0.906" Color="#FF262d33" />
-                    <GradientStop Offset="1" Color="#FF262d33" />
-                </GradientStopCollection>
-            </LinearGradientBrush.GradientStops>
-        </LinearGradientBrush>
-
-      <Style x:Key="MyCloseButtonStyle" TargetType="Button">
-         <Setter Property="Template">
-            <Setter.Value>
-               <ControlTemplate TargetType="Button">
-                  <Grid>
-                     <VisualStateManager.VisualStateGroups>
-                        <VisualStateGroup x:Name="CommonStates">
-                           <VisualState x:Name="Normal"/>
-                           <VisualState x:Name="MouseOver">
-                              <Storyboard>
-                                 <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource MyButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                 </ObjectAnimationUsingKeyFrames>
-                              </Storyboard>
-                           </VisualState>
-                           <VisualState x:Name="Pressed">
-                              <Storyboard>
-                                 <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                    <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource MyButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                 </ObjectAnimationUsingKeyFrames>
-                              </Storyboard>
-                           </VisualState>
-                            <VisualState x:Name="Disabled">
-                                <Storyboard>
-                                    <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".3"/>
-                                    <DoubleAnimation Duration="0" Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity" To=".3"/>
-                                </Storyboard>
-                            </VisualState>
-                        </VisualStateGroup>
-                     </VisualStateManager.VisualStateGroups>
-                     <Border x:Name="Background" CornerRadius="0,0,2,0" Background="#FF565456">
-                        <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                     </Border>
-                     <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                     <Path x:Name="path" Fill="White" Margin="0,0,0,1" Visibility="Collapsed"
-	                Height="6"
-		Width="7"
-		Stretch="Fill"
-		Opacity="1"
-		Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"/>
-                  </Grid>
-               </ControlTemplate>
-            </Setter.Value>
-         </Setter>
-      </Style>
-
-      <Style x:Key="WindowButtonStyle" TargetType="Button">
-            <Setter Property="Foreground" Value="#FFFFFFFF" />
-            <Setter Property="Padding" Value="3" />
-            <Setter Property="BorderThickness" Value="1" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Grid>
-                            <VisualStateManager.VisualStateGroups>
-                                <VisualStateGroup x:Name="CommonStates">
-                                    <VisualState x:Name="Normal" />
-                                    <VisualState x:Name="MouseOver">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                                <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                    <VisualState x:Name="Pressed">
-                                        <Storyboard>
-                                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                                <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                                            </ObjectAnimationUsingKeyFrames>
-                                        </Storyboard>
-                                    </VisualState>
-                                </VisualStateGroup>
-                            </VisualStateManager.VisualStateGroups>
-                            <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                                <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                            </Border>
-                            <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-      <Style x:Key="messageBoxStyle" TargetType="{x:Type xctk:MessageBox}">
-         <Setter Property="Background" Value="Black" />
-         <Setter Property="BorderBrush" Value="Pink" />
-         <Setter Property="CaptionForeground" Value="White" />
-         <Setter Property="WindowBorderBrush" Value="Black" />
-         <Setter Property="WindowBackground" Value="#FF7304A2" />
-         <Setter Property="WindowOpacity" Value="0.65" />
-         <Setter Property="Foreground" Value="White"/>
-         <Setter Property="ButtonRegionBackground" Value="{StaticResource buttonRegionBackground}" />
-         <Setter Property="OkButtonStyle" Value="{StaticResource WindowButtonStyle}" />
-         <Setter Property="CancelButtonStyle" Value="{StaticResource WindowButtonStyle}" />
-         <Setter Property="YesButtonStyle" Value="{StaticResource WindowButtonStyle}" />
-         <Setter Property="NoButtonStyle" Value="{StaticResource WindowButtonStyle}" />
-         <Setter Property="CloseButtonStyle" Value="{StaticResource MyCloseButtonStyle}"/>
-      </Style>
-   </sample:DemoView.Resources>
-
-   <StackPanel Orientation="Horizontal"
-               HorizontalAlignment="Center">
-      <Button Width="150"
-              Height="100"
-              Margin="10"
-              Content="Standard MessageBox"
-              Click="StandardMessageBoxButton_Click"/>
-      <Button Width="150"
-              Height="100"
-              Content="Styled MessageBox"
-              Click="StyledMessageBoxButton_Click"/>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs
deleted file mode 100644
index 3597e60fa..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows;
-
-namespace Samples.Modules.MessageBox.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    private string _standardTitle = "Standard MessageBox";
-    private string _styledTitle = "Extended WPF Toolkit MessageBox";
-    private string _standardMessage = "The standard system MessageBox will always have this look. No styling is possible.";
-    private string _styledMessage = "The Toolkit MessageBox allows you to style it in order to integrate it into your application colors and styles.";
-
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void StandardMessageBoxButton_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      System.Windows.MessageBox.Show( _standardMessage, _standardTitle );
-    }
-
-    private void StyledMessageBoxButton_Click( object sender, System.Windows.RoutedEventArgs e )
-    {
-      System.Windows.Style style = ( System.Windows.Style )this.Resources[ "messageBoxStyle" ];
-      Xceed.Wpf.Toolkit.MessageBox.Show( null, _styledMessage, _styledTitle, style );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml
deleted file mode 100644
index 19ef4f60b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.MessageBox.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.MessageBox.Views"
-              Header="MessageBox" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs
deleted file mode 100644
index d6a4b87c7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.MessageBox/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.MessageBox.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
deleted file mode 100644
index 716ac43c9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Numeric.Views;
-
-namespace Samples.Modules.Numeric
-{
-  public class NumericModule : ModuleBase
-  {
-    public NumericModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
deleted file mode 100644
index 914763a91..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Numeric Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Numeric Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj
deleted file mode 100644
index 0ea3e3fe5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Samples.Modules.Numeric.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{CBED4977-79ED-4E46-AA00-0A4D83D333A6}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Numeric</RootNamespace>
-    <AssemblyName>Samples.Modules.Numeric</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="NumericModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
deleted file mode 100644
index 9f23e5799..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
+++ /dev/null
@@ -1,176 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Numeric.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:local="clr-namespace:Samples.Modules.Numeric.Views"
-                 Title="Numeric Controls"
-                 x:Name="_demo">
-    <sample:DemoView.Resources>
-        <x:Array x:Key="FormatStringComboBox" Type="local:FormatObject">
-            <local:FormatObject Value="C2" DisplayValue="Currency" />
-            <local:FormatObject Value="F2" DisplayValue="Fixed Point" />
-            <local:FormatObject Value="G" DisplayValue="General" />
-            <local:FormatObject Value="N" DisplayValue="Number" />
-            <local:FormatObject Value="P2" DisplayValue="Percent" />
-        </x:Array>
-
-        <DataTemplate x:Key="FormatStringItemTemplate">
-            <TextBlock Text="{Binding DisplayValue}" />
-        </DataTemplate>
-
-        <ObjectDataProvider x:Key="AllowInputSpecialValuesComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="xctk:AllowedSpecialValues" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-
-        <ObjectDataProvider x:Key="ParsingNumberStyleComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="sys:Globalization.NumberStyles" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-
-        <Style x:Key="ControlInError" TargetType="Control">
-            <Style.Triggers>
-                <Trigger Property="Validation.HasError" Value="true">
-                    <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
-                            Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
-
-        <sys:String x:Key="allowInputSpecialValuesTooltip">Infinity and -Infinity input will not be accepted if Maximum and/or Minimum values does not allow them.</sys:String>
-        <sys:String x:Key="parsingNumberStyleTooltip">HexNumber is not a valid choice when used with a DoubleUpDown (current control used in this sample). It will work with the following controls: IntegerUpDown, ByteUpDown, LongUpDown, and ShortUpDown.</sys:String>
-
-    </sample:DemoView.Resources>
-
-   <StackPanel>
-      <RichTextBox IsReadOnly="True" BorderThickness="0">
-         <FlowDocument>
-            <Paragraph>
-               Numeric up-down controls provide a TextBox with button spinners that allow incrementing 
-               and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.
-            </Paragraph>
-            <Paragraph>
-               The following controls are available to support various native numeric types: 
-               ByteUpDown, ShortUpDown, IntegerUpDown, LongUpDown, SingleUpDown, DoubleUpDown, DecimalUpDown.
-            </Paragraph>
-         </FlowDocument>
-      </RichTextBox>
-      <Grid>
-           <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="*" />
-           </Grid.RowDefinitions>
-
-           <GroupBox Header="Features" Grid.Row="0" Margin="5">
-               <Grid Margin="5" HorizontalAlignment="Left">
-                   <Grid.RowDefinitions>
-                       <RowDefinition Height="Auto" />
-                       <RowDefinition Height="Auto" />
-                       <RowDefinition Height="Auto" />
-                       <RowDefinition Height="Auto" />
-                       <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                   <Grid.ColumnDefinitions>
-                       <ColumnDefinition Width="Auto" />
-                       <ColumnDefinition Width="Auto" />
-                       <ColumnDefinition Width="Auto" />
-                       <ColumnDefinition Width="Auto" />
-                       <ColumnDefinition Width="Auto" />
-                       <ColumnDefinition Width="Auto" />
-                   </Grid.ColumnDefinitions>
-
-                   <!-- 1st column -->
-                   <TextBlock Text="Allow Input Special Values:" VerticalAlignment="Center" />
-                   <ComboBox Grid.Column="1" ItemsSource="{Binding Source={StaticResource AllowInputSpecialValuesComboBox}}" SelectedValue="{Binding AllowInputSpecialValues, ElementName=_doubleUpDown}" ToolTip="{StaticResource allowInputSpecialValuesTooltip}" Margin="5" Width="108"/>
-
-                   <TextBlock Text="Mouse Wheel:" Grid.Row="1" VerticalAlignment="Center" />
-                   <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding MouseWheelActiveOnFocus, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-
-                   <TextBlock Text="Show Button Spinner:" Grid.Row="2" VerticalAlignment="Center" />
-                   <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding ShowButtonSpinner, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-
-                   <TextBlock Text="Allow Spin:" Grid.Row="3" VerticalAlignment="Center" />
-                   <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding AllowSpin, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-
-                   <TextBlock Text="Is Read Only:" Grid.Row="4" VerticalAlignment="Center" />
-                   <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding IsReadOnly, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
-
-                    <!-- 2nd column -->
-                   <TextBlock Grid.Column="2" Text="CultureInfo:" VerticalAlignment="Center" Margin="10,0,0,0" />
-                   <ComboBox Grid.Column="3" ItemsSource="{Binding Cultures, ElementName=_demo}" SelectedValue="{Binding CultureInfo, ElementName=_doubleUpDown}" Width="65" Margin="5" />
-
-                   <TextBlock Grid.Column="2" Grid.Row="1" Text="FormatString:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <ComboBox Grid.Column="3" Grid.Row="1" ItemsSource="{Binding Source={StaticResource FormatStringComboBox}}" Text="{Binding FormatString, ElementName=_doubleUpDown, ValidatesOnExceptions=True}" ItemTemplate="{StaticResource FormatStringItemTemplate}" Style="{StaticResource ControlInError}" IsEditable="True" TextSearch.TextPath="Value" Width="65" Margin="5" />
-
-                   <TextBlock Grid.Column="2" Grid.Row="2" Text="Increment" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="2" Minimum="0" Value="{Binding Increment, ElementName=_doubleUpDown}" AllowInputSpecialValues="None" VerticalAlignment="Center" Margin="5" Width="65" />
-
-                   <TextBlock Grid.Column="2" Grid.Row="3" Text="Minimum" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="3" Value="{Binding Minimum, ElementName=_doubleUpDown}" AllowInputSpecialValues="NegativeInfinity" VerticalAlignment="Center" Margin="5" Width="65" />
-
-                   <TextBlock Grid.Column="2" Grid.Row="4" Text="Maximum" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="4" Value="{Binding Maximum, ElementName=_doubleUpDown}" AllowInputSpecialValues="PositiveInfinity" VerticalAlignment="Center" Margin="5" Width="65" />
-
-                   <!-- 3rd column -->
-                   <TextBlock Grid.Column="4" Text="ParsingNumberStyle:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <ComboBox Grid.Column="5" ItemsSource="{Binding Source={StaticResource ParsingNumberStyleComboBox}}" SelectedValue="{Binding ParsingNumberStyle, ElementName=_doubleUpDown}" ToolTip="{StaticResource parsingNumberStyleTooltip}" Width="135" Margin="5" />
-
-                   <TextBlock Text="Watermark:" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <TextBox Grid.Column="5" Grid.Row="1" Width="135" Margin="5" Text="{Binding Watermark, ElementName=_doubleUpDown}" />
-
-                   <TextBlock Text="Default Value:" Grid.Column="4" Grid.Row="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <xctk:DoubleUpDown Grid.Column="5" Grid.Row="2" Value="{Binding DefaultValue, ElementName=_doubleUpDown}" AllowInputSpecialValues="Any" VerticalAlignment="Center" Margin="5" Width="135" />
-
-                   <TextBlock Text="Value:" Grid.Column="4" Grid.Row="3" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <xctk:DoubleUpDown Grid.Column="5" Grid.Row="3" Value="{Binding Value, ElementName=_doubleUpDown, ValidatesOnExceptions=True}" AllowInputSpecialValues="Any" Style="{StaticResource ControlInError}" VerticalAlignment="Center" Margin="5" Width="135" />
-
-                   <TextBlock Text="Text:" Grid.Column="4" Grid.Row="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                   <TextBox Grid.Column="5" Grid.Row="4" Text="{Binding Text, ElementName=_doubleUpDown}" VerticalAlignment="Center" Margin="5" Width="135" />
-                </Grid>
-           </GroupBox>
-
-           <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left">
-               <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-               <xctk:DoubleUpDown x:Name="_doubleUpDown"
-                                  Margin="10" Width="250" 
-                                  AllowInputSpecialValues="Any"
-                                  ShowButtonSpinner="True" 
-                                  AllowSpin="True"
-                                  IsReadOnly="False" 
-                                  MouseWheelActiveOnFocus="True"
-                                  CultureInfo="en-US"
-                                  FormatString="C2"
-                                  Increment="0.5"
-                                  Maximum="100"
-                                  Minimum="0"
-                                  ParsingNumberStyle="Any"
-                                  Watermark="Enter Text"
-                                  DefaultValue="10"
-                                  Value="25" />
-         </StackPanel>
-
-       </Grid>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
deleted file mode 100644
index 3b2f766bb..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Collections.Generic;
-using System.Globalization;
-using System;
-
-namespace Samples.Modules.Numeric.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      this.Cultures = new List<CultureInfo>() { new CultureInfo( "en-US" ),
-                                                new CultureInfo("en-GB"),
-                                                new CultureInfo("fr-FR"),
-                                                new CultureInfo("ar-DZ"),
-                                                new CultureInfo("zh-CN"),
-                                                new CultureInfo("cs-CZ") };
-
-      InitializeComponent();
-    }
-
-    public List<CultureInfo> Cultures
-    {
-      get;
-      private set;
-    }
-  }
-
-
-  public class FormatObject
-  {
-    public string Value
-    {
-      get;
-      set;
-    }
-
-    public string DisplayValue
-    {
-      get;
-      set;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
deleted file mode 100644
index adf3ddeb8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Numeric.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Numeric.Views"
-              Header="Numeric" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
deleted file mode 100644
index c07eb25f6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Numeric.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Converters/ComboBoxToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Converters/ComboBoxToVisibilityConverter.cs
deleted file mode 100644
index 055e79eab..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Converters/ComboBoxToVisibilityConverter.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
-using System.Windows;
-
-namespace Samples.Modules.Panels.Converters
-{
-  class ComboBoxToVisibilityConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      if( ( value is int ) && ( parameter is string )
-        && ( int )value == Int32.Parse( ( string )parameter ) )
-      {
-        return Visibility.Visible;
-      }
-
-      return Visibility.Collapsed;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AnimatedTimelinePanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AnimatedTimelinePanel.jpg
deleted file mode 100644
index 71165a01d..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AnimatedTimelinePanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AutoStretchStackPanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AutoStretchStackPanel.jpg
deleted file mode 100644
index f6665ca2b..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/AutoStretchStackPanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/CameraPanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/CameraPanel.jpg
deleted file mode 100644
index 9aeb5e857..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/CameraPanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Canvas.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Canvas.jpg
deleted file mode 100644
index 9c5457065..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Canvas.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Carousel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Carousel.jpg
deleted file mode 100644
index 66e9f2b7c..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Carousel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/DockPanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/DockPanel.jpg
deleted file mode 100644
index 2df201c9c..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/DockPanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Grid.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Grid.jpg
deleted file mode 100644
index 34a0b8d16..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/Grid.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/PerspectivePanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/PerspectivePanel.jpg
deleted file mode 100644
index 875e505be..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/PerspectivePanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RadialCanvas.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RadialCanvas.jpg
deleted file mode 100644
index f9d2aec2e..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RadialCanvas.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RelativeCanvas.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RelativeCanvas.jpg
deleted file mode 100644
index 0d2a1936e..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/RelativeCanvas.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackPanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackPanel.jpg
deleted file mode 100644
index 72ea46bb9..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackPanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackedStackPanel.jpg b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackedStackPanel.jpg
deleted file mode 100644
index 354897e0c..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/OpenSourceImages/StackedStackPanel.jpg and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/PanelsModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/PanelsModule.cs
deleted file mode 100644
index 378ec58d8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/PanelsModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Panels.Views;
-
-namespace Samples.Modules.Panels
-{
-  public class PanelsModule : ModuleBase
-  {
-    public PanelsModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( SwitchPanelNavItem ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( SwitchPanelView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Properties/AssemblyInfo.cs
deleted file mode 100644
index d4f01a3e8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-﻿using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Samples.Modules.Panels" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "" )]
-[assembly: AssemblyProduct( "Samples.Modules.Panels" )]
-[assembly: AssemblyCopyright( "Copyright ©  2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Samples.Modules.Panels.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Samples.Modules.Panels.csproj
deleted file mode 100644
index e35fa2bca..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Samples.Modules.Panels.csproj
+++ /dev/null
@@ -1,119 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D51C9DFE-7661-4C32-A9D7-5772D366F578}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Panels</RootNamespace>
-    <AssemblyName>Samples.Modules.Panels</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Converters\ComboBoxToVisibilityConverter.cs" />
-    <Compile Include="PanelsModule.cs" />
-    <Compile Include="Views\SwitchPanelNavItem.xaml.cs">
-      <DependentUpon>SwitchPanelNavItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SwitchPanelView.xaml.cs">
-      <DependentUpon>SwitchPanelView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="OpenSourceImages\AnimatedTimelinePanel.jpg" />
-    <Resource Include="OpenSourceImages\AutoStretchStackPanel.jpg" />
-    <Resource Include="OpenSourceImages\CameraPanel.jpg" />
-    <Resource Include="OpenSourceImages\Canvas.jpg" />
-    <Resource Include="OpenSourceImages\Carousel.jpg" />
-    <Resource Include="OpenSourceImages\DockPanel.jpg" />
-    <Resource Include="OpenSourceImages\Grid.jpg" />
-    <Resource Include="OpenSourceImages\PerspectivePanel.jpg" />
-    <Resource Include="OpenSourceImages\RadialCanvas.jpg" />
-    <Resource Include="OpenSourceImages\RelativeCanvas.jpg" />
-    <Resource Include="OpenSourceImages\StackedStackPanel.jpg" />
-    <Resource Include="OpenSourceImages\StackPanel.jpg" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\SwitchPanelNavItem.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\SwitchPanelView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml
deleted file mode 100644
index 90e1bddf1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Panels.Views.SwitchPanelNavItem"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Panels.Views" 
-              Header="Switch Panel" Tag="{x:Type views:SwitchPanelView}"
-              Style="{StaticResource newFeature}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:SwitchPanelNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}"/>
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml.cs
deleted file mode 100644
index 3d33da119..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelNavItem.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Panels.Views
-{
-  /// <summary>
-  /// Interaction logic for CalculatorUpDownNavItem.xaml
-  /// </summary>
-  public partial class SwitchPanelNavItem : TreeViewItem
-  {
-    public SwitchPanelNavItem()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml.cs
deleted file mode 100644
index 714190aa6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml.cs
+++ /dev/null
@@ -1,206 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System;
-using System.Windows;
-using Xceed.Wpf.Toolkit.Panels;
-using System.Collections.Generic;
-using Xceed.Wpf.Toolkit;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Diagnostics;
-using System.Windows.Media.Imaging;
-
-namespace Samples.Modules.Panels.Views
-{
-  /// <summary>
-  /// Interaction logic for SwitchPanelView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class SwitchPanelView : DemoView
-  {
-    #region Members
-
-
-    #endregion
-
-    public SwitchPanelView()
-    {
-      InitializeComponent();
-    }
-
-    #region Event Handlers
-
-    private void Hyperlink_RequestNavigate( object sender, System.Windows.Navigation.RequestNavigateEventArgs e )
-    {
-      Process.Start( new ProcessStartInfo( e.Uri.AbsoluteUri ) );
-      e.Handled = true;
-    }
-
-    private void OnLayoutComboSelectionChanged( object sender, RoutedEventArgs e )
-    {
-      ComboBox comboBox = sender as ComboBox;
-      bool isPlusPanel = (comboBox.SelectedIndex >= 2);
-
-      if( _openSourceScreenShot != null )
-        _openSourceScreenShot.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-      if( _openSourceScreenShotDesc != null )
-        _openSourceScreenShotDesc.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-      if( _openSourceHyperlink != null )
-        _openSourceHyperlink.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
-      if( _switchPanel != null )
-        _switchPanel.Visibility = isPlusPanel ? Visibility.Collapsed : Visibility.Visible;
-
-      if( isPlusPanel )
-      {
-        BitmapImage bitmapImage = new BitmapImage();
-        string desc;
-
-        bitmapImage.BeginInit();
-        switch( comboBox.SelectedIndex )
-        {
-          case 2: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Canvas.jpg", UriKind.Relative );
-            desc = this.Resources[ "canvasPanelDescription" ] as string;
-            break;
-          case 3: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Carousel.jpg", UriKind.Relative );
-            desc = this.Resources[ "carouselDescription" ] as string;
-            break;
-          case 4: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\DockPanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "dockPanelDescription" ] as string;
-            break;
-          case 5: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Grid.jpg", UriKind.Relative );
-            desc = this.Resources[ "gridDescription" ] as string;
-            break;
-          case 6: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\StackPanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "stackPanelDescription" ] as string;
-            break;
-          case 7: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\StackedStackPanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "stackedStackPanelDescription" ] as string;
-            break;
-          case 8: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AutoStretchStackPanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "autoStretchStackPanelDescription" ] as string;
-              break;
-          case 9: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\RelativeCanvas.jpg", UriKind.Relative );
-            desc = this.Resources[ "relativeCanvasDescription" ] as string;
-              break;
-          case 10: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\RadialCanvas.jpg", UriKind.Relative );
-            desc = this.Resources[ "radialCanvasDescription" ] as string;
-            break;
-          case 11: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\CameraPanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "cameraPanelDescription" ] as string;
-            break;
-          case 12: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\PerspectivePanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "perspectivePanelDescription" ] as string;
-            break;
-          case 13: 
-            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AnimatedTimelinePanel.jpg", UriKind.Relative );
-            desc = this.Resources[ "animatedTimelinePanelDescription" ] as string;
-            break;
-          default: throw new InvalidDataException( "LayoutcomboBox.SelectedIndex is not valid." );
-        }
-        bitmapImage.EndInit();
-
-        if( _openSourceScreenShot != null )
-          _openSourceScreenShot.Source = bitmapImage;
-        if( _openSourceScreenShotDesc != null )
-          _openSourceScreenShotDesc.Text = desc;
-      }
-    }
-
-    private void OnSwitchPanelLayoutChanged( object sender, RoutedEventArgs e )
-    {
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #endregion 
-
-    #region Methods (Private)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-    #endregion
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs
deleted file mode 100644
index c86bb11f0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/PieModule.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Pie.Views;
-
-namespace Samples.Modules.Pie
-{
-  public class PieModule : ModuleBase
-  {
-    public PieModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-      Container.RegisterNavigationType( typeof( PieChart ) );
-      Container.RegisterNavigationType( typeof( PieProgress ) );
-
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8c93b58e3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Pie Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Pie Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj
deleted file mode 100644
index 86d6afd71..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Samples.Modules.Pie.csproj
+++ /dev/null
@@ -1,118 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{08E7A934-4991-4CFC-BE12-B43AC6713122}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Pie</RootNamespace>
-    <AssemblyName>Samples.Modules.Pie</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="PieModule.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PieChart.xaml.cs">
-      <DependentUpon>PieChart.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\PieProgress.xaml.cs">
-      <DependentUpon>PieProgress.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\PieChart.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\PieProgress.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml
deleted file mode 100644
index 285ac3231..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml
+++ /dev/null
@@ -1,228 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Pie.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
-                 Title="Pie"
-                 Description="The Pie shape is a WPF shape that represents a portion of an ellipse.  It is in the same shape as a slice of pie (hence the name).  More precisely, the Pie shape is represented as either a full ellipse (Slice = 1.0), nothing (Slice = 0.0), or an arc of an ellipse joined to its center by two line segments."
-                 x:Name="demo">
-   <sample:DemoView.Resources>
-      <xctk:ColorToSolidColorBrushConverter x:Key="colorConverter" />
-   </sample:DemoView.Resources>
-
-   <Grid HorizontalAlignment="Stretch"
-         VerticalAlignment="Stretch">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto"/>
-         <ColumnDefinition Width="*"/>
-      </Grid.ColumnDefinitions>
-
-      <GroupBox Header="Features"
-                 HorizontalAlignment="Left"
-                 VerticalAlignment="Stretch"
-                 Margin="20,0,0,0">
-         <Grid DataContext="{Binding ElementName=pie}"
-            Width="337">
-
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="113" />
-               <ColumnDefinition Width="145" />
-               <ColumnDefinition Width="79" />
-            </Grid.ColumnDefinitions>
-
-            <Grid.RowDefinitions>
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-               <RowDefinition Height="45" />
-            </Grid.RowDefinitions>
-
-            <TextBlock Grid.Row="0"
-                    Grid.Column="0"
-                    Text="Mode"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    HorizontalAlignment="Left"
-                    Margin="20,0,0,0" 
-                    />
-            <ComboBox  Grid.Row="0"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="1"
-                    HorizontalAlignment="Stretch"
-                    Height="26"
-                    Width="Auto"
-                    Margin="10,5,10,5"
-                    SelectedItem="{Binding Mode}"
-                    SelectionChanged="ComboBox_SelectionChanged">
-               <x:StaticExtension Member="xctk:PieMode.Manual" />
-               <x:StaticExtension Member="xctk:PieMode.EndAngle" />
-               <x:StaticExtension Member="xctk:PieMode.Slice" />
-            </ComboBox>
-
-            <TextBlock Grid.Row="1"
-                    Grid.Column="0"
-                    Text="Start Angle"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    HorizontalAlignment="Left"
-                    Margin="20,0,0,0" />
-            <Slider    Grid.Row="1"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Minimum="0"
-                    Maximum="360"
-                    Width="Auto"
-                    Value="{Binding StartAngle}"
-                    Height="Auto"
-                    HorizontalAlignment="Stretch"
-                    Margin="10,5,10,5"
-                    Grid.ColumnSpan="1" />
-            <TextBlock Grid.Row="1"
-                    Grid.Column="2"
-                    Width="50"
-                    Text="{Binding StartAngle}"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    TextTrimming="CharacterEllipsis" />
-
-            <TextBlock Grid.Row="2"
-                    Grid.Column="0"
-                    Text="End Angle"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    HorizontalAlignment="Left"
-                    Margin="20,0,0,0" />
-            <Slider    x:Name="endAngleSlider"
-                    Grid.Row="2"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Minimum="0"
-                    Maximum="360"
-                    Width="Auto"
-                    Value="{Binding EndAngle}"
-                    Height="Auto"
-                    HorizontalAlignment="Stretch"
-                    Margin="10,5,10,5"
-                    Grid.ColumnSpan="1" />
-            <TextBlock Grid.Row="2"
-                    Grid.Column="2"
-                    Width="50"
-                    Text="{Binding EndAngle}"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    TextTrimming="CharacterEllipsis" />
-
-            <TextBlock Grid.Row="3"
-                    Grid.Column="0"
-                    Text="Slice"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    HorizontalAlignment="Left"
-                    Margin="20,0,0,0" />
-            <Slider x:Name="sliceSlider"
-                    Grid.Row="3"
-                    Grid.Column="1"
-                    VerticalAlignment="Center"
-                    Minimum="0"
-                    Maximum="1"
-                    Width="Auto"
-                    Value="{Binding Slice}"
-                    Height="Auto"
-                    HorizontalAlignment="Stretch"
-                    Margin="10,5,10,5"
-                    Grid.ColumnSpan="1" />
-            <TextBlock Grid.Row="3"
-                    Grid.Column="2"
-                    Width="50"
-                    Text="{Binding Slice}"
-                    VerticalAlignment="Center"
-                    Height="Auto"
-                    TextTrimming="CharacterEllipsis" />
-
-            <TextBlock Grid.Row="4"
-                    Grid.Column="0"
-                    Margin="20,5,0,5"
-                    Text="Sweep Direction"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center" />
-            <ComboBox  Grid.Row="4"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="1"
-                    HorizontalAlignment="Stretch"
-                    Height="26"
-                    Width="Auto"
-                    Margin="10,5,10,5"
-                    SelectedValue="{Binding SweepDirection}"
-                    SelectedValuePath="Content">
-               <ComboBoxItem Content="{x:Static SweepDirection.Clockwise}" />
-               <ComboBoxItem Content="{x:Static SweepDirection.Counterclockwise}" />
-            </ComboBox>
-
-            <TextBlock Grid.Row="5"
-                    Grid.Column="0"
-                    Margin="20,5,0,5"
-                    Text="Fill Color"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center" />
-            <xctk:ColorPicker x:Name="FillSelector"
-                    Grid.Row="5"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="1"
-                    HorizontalAlignment="Stretch"
-                    SelectedColor="#FF5318A5"
-                    Height="26"
-                    Margin="10,5,10,5"
-                    Width="Auto" />            
-            <TextBlock Grid.Row="6"
-                    Grid.Column="0"
-                    Margin="20,5,0,5"
-                    Text="Stroke Color"
-                    HorizontalAlignment="Left"
-                    VerticalAlignment="Center" />
-            <xctk:ColorPicker  x:Name="StrokeSelector"
-                    Grid.Row="6"
-                    Grid.Column="1"
-                    Grid.ColumnSpan="1"
-                    HorizontalAlignment="Stretch"
-                    SelectedColor="Black"
-                    Height="26"
-                    Margin="10,5,10,5"
-                    Width="Auto" />            
-         </Grid>
-      </GroupBox>
-      <xctk:Pie x:Name="pie"
-                Grid.Column="1"
-                Height="{Binding ElementName=pie, Path=ActualWidth}"
-                Fill="{Binding ElementName=FillSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
-                Stroke="{Binding ElementName=StrokeSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
-                StrokeThickness="2"
-                StartAngle="180"
-                SweepDirection="Clockwise"
-                Margin="20,0,0,0"
-                HorizontalAlignment="Stretch"
-                VerticalAlignment="Center" />
-
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs
deleted file mode 100644
index 2e61e4aa9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-
-namespace Samples.Modules.Pie.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void ComboBox_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
-    {
-      ComboBox modeCombo = ( ComboBox )sender;
-      PieMode newMode = ( PieMode )modeCombo.SelectedItem;
-      this.endAngleSlider.IsEnabled = ( newMode != PieMode.Slice );
-      this.sliceSlider.IsEnabled = ( newMode != PieMode.EndAngle );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml
deleted file mode 100644
index bf7314017..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Pie.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Pie.Views"
-              Header="Pie" Tag="{x:Type views:HomeView}" >
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-   <TreeViewItem Header="Chart" Tag="{x:Type views:PieChart}" />
-   <TreeViewItem Header="Progress" Tag="{x:Type views:PieProgress}" />
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs
deleted file mode 100644
index 02e303d5d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Pie.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml
deleted file mode 100644
index 3763b5724..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml
+++ /dev/null
@@ -1,238 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Pie.Views.PieChart"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
-                 Title="Chart"
-                 Description="Obviously, the Pie control can be used to create a pie chart.">
-
-   <sample:DemoView.Resources>
-      <XmlDataProvider x:Key="XMLData">
-         <x:XData>
-            <Milks xmlns="">
-               <Milk Type="Human"
-                     Fat=".040"
-                     Protein=".011"
-                     Lactose=".068"
-                     Water=".88" />
-               <Milk Type="Cow"
-                     Fat=".037"
-                     Protein=".034"
-                     Lactose=".048"
-                     Water=".87" />
-               <Milk Type="Cow Holstein Friesian"
-                     Fat=".036"
-                     Protein=".034"
-                     Lactose=".049"
-                     Water=".87" />
-               <Milk Type="Cow Brown Swiss"
-                     Fat=".040"
-                     Protein=".036"
-                     Lactose=".047"
-                     Water=".87" />
-               <Milk Type="Cow Jersey"
-                     Fat=".052"
-                     Protein=".039"
-                     Lactose=".049"
-                     Water=".85" />
-               <Milk Type="Cow Zebu"
-                     Fat=".047"
-                     Protein=".033"
-                     Lactose=".049"
-                     Water=".86" />
-               <Milk Type="Water Buffalo"
-                     Fat=".069"
-                     Protein=".038"
-                     Lactose=".051"
-                     Water=".83" />
-               <Milk Type="Yak"
-                     Fat=".065"
-                     Protein=".058"
-                     Lactose=".046"
-                     Water=".82" />
-               <Milk Type="Goat"
-                     Fat=".040"
-                     Protein=".034"
-                     Lactose=".045"
-                     Water=".88" />
-               <Milk Type="Sheep"
-                     Fat=".075"
-                     Protein=".060"
-                     Lactose=".048"
-                     Water=".80" />
-               <Milk Type="Camel"
-                     Fat=".029"
-                     Protein=".039"
-                     Lactose=".054"
-                     Water=".87" />
-               <Milk Type="Reindeer"
-                     Fat=".017"
-                     Protein=".011"
-                     Lactose=".028"
-                     Water=".68" />
-               <Milk Type="Horse"
-                     Fat=".012"
-                     Protein=".020"
-                     Lactose=".063"
-                     Water=".90" />
-               <Milk Type="Fin Whale"
-                     Fat=".042"
-                     Protein=".012"
-                     Lactose=".013"
-                     Water=".43" />
-            </Milks>
-         </x:XData>
-      </XmlDataProvider>
-
-      <local:SliceLabelConverter x:Key="sliceLabelConverter" />
-
-      <DataTemplate x:Key="MilkTemplate">
-         <StackPanel Orientation="Horizontal">
-            <TextBlock Width="135"
-                       Text="{Binding XPath=@Type}" />
-            <TextBlock Width="100"
-                       Text="{Binding XPath=@Fat}" />
-            <TextBlock Width="100"
-                       Text="{Binding XPath=@Protein}" />
-            <TextBlock Width="100"
-                       Text="{Binding XPath=@Lactose}" />
-            <TextBlock Width="100"
-                       Text="{Binding XPath=@Water}" />
-         </StackPanel>
-      </DataTemplate>
-   </sample:DemoView.Resources>
-   <Grid x:Name="LayoutRoot"
-         DataContext="{Binding Source={StaticResource XMLData}, XPath=/Milks/Milk}"
-         HorizontalAlignment="Center"
-         VerticalAlignment="Center">
-      <Control />
-      <ListBox x:Name="PieDataListBox"
-               VerticalAlignment="Top"
-               Height="150"
-               ItemTemplate="{StaticResource MilkTemplate}"
-               ItemsSource="{Binding}"
-               IsSynchronizedWithCurrentItem="True"
-               HorizontalAlignment="Center"
-               Width="503"
-               ScrollViewer.HorizontalScrollBarVisibility="Disabled" />
-      <Viewbox x:Name="PiesViewbox"
-               HorizontalAlignment="Center"
-               Margin="20,270,20,0"
-               VerticalAlignment="Top"
-               Width="300"
-               Height="300"
-               Stretch="Fill">
-         <Grid Width="192"
-               x:Name="PiesGrid"
-               Height="192">
-
-            <xctk:Pie x:Name="WaterPie"
-                      Fill="#FFCFDCFA"
-                      Stroke="#FF000000"
-                      Opacity="0.5"
-                      Slice="{Binding XPath=@Water}" />
-
-            <xctk:Pie x:Name="LactosePie"
-                      Fill="#FFEBFF68"
-                      Stroke="#FF000000"
-                      Opacity="0.5"
-                      StartAngle="{Binding EndAngle, ElementName=WaterPie, Mode=OneWay}"
-                      Slice="{Binding XPath=@Lactose}" />
-
-            <xctk:Pie x:Name="FatPie"
-                      Fill="#FF6EFA6E"
-                      Stroke="#FF000000"
-                      Opacity="0.5"
-                      StartAngle="{Binding EndAngle, ElementName=LactosePie, Mode=OneWay}"
-                      Slice="{Binding XPath=@Fat}" />
-
-            <xctk:Pie x:Name="ProteinPie"
-                      Fill="#FFFF8676"
-                      Stroke="#FF000000"
-                      Opacity="0.5"
-                      StartAngle="{Binding EndAngle, ElementName=FatPie, Mode=OneWay}"
-                      Slice="{Binding XPath=@Protein}" />
-
-            <TextBlock RenderTransformOrigin="0.5,0.5"
-                       VerticalAlignment="Center"
-                       Text="{Binding ElementName=WaterPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Water}"
-                       HorizontalAlignment="Left"
-                       Margin="60,0,0,0"
-                       FontFamily="Segoe UI"
-                       FontSize="9">
-					<TextBlock.RenderTransform>
-						<TransformGroup>
-							<TranslateTransform X="135" Y="0" />
-							<RotateTransform Angle="{Binding EndAngle, ElementName=WaterPie}" />
-						</TransformGroup>
-					</TextBlock.RenderTransform>
-            </TextBlock>
-
-            <TextBlock RenderTransformOrigin="0.5,0.5"
-                       VerticalAlignment="Center"
-                       Text="{Binding ElementName=LactosePie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Lactose}"
-                       HorizontalAlignment="Left"
-                       Margin="60,0,0,0"
-                       FontFamily="Segoe UI"
-                       FontSize="9">
-					<TextBlock.RenderTransform>
-						<TransformGroup>
-							<TranslateTransform X="135" Y="0" />
-							<RotateTransform Angle="{Binding EndAngle, ElementName=LactosePie}" />
-						</TransformGroup>
-					</TextBlock.RenderTransform>
-            </TextBlock>
-
-            <TextBlock RenderTransformOrigin="0.5,0.5"
-                       VerticalAlignment="Center"
-                       Text="{Binding ElementName=FatPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Fat}"
-                       HorizontalAlignment="Left"
-                       Margin="60,0,0,0"
-                       FontFamily="Segoe UI"
-                       FontSize="9">
-					<TextBlock.RenderTransform>
-						<TransformGroup>
-							<TranslateTransform X="135" Y="0" />
-							<RotateTransform Angle="{Binding EndAngle, ElementName=FatPie}" />
-						</TransformGroup>
-					</TextBlock.RenderTransform>
-            </TextBlock>
-
-            <TextBlock RenderTransformOrigin="0.5,0.5"
-                       VerticalAlignment="Center"
-                       Text="{Binding ElementName=ProteinPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Protein}"
-                       HorizontalAlignment="Left"
-                       Margin="60,0,0,0"
-                       FontFamily="Segoe UI"
-                       FontSize="9">
-					<TextBlock.RenderTransform>
-						<TransformGroup>
-							<TranslateTransform X="135" Y="0" />
-							<RotateTransform Angle="{Binding EndAngle, ElementName=ProteinPie}" />
-						</TransformGroup>
-					</TextBlock.RenderTransform>
-            </TextBlock>
-
-         </Grid>
-      </Viewbox>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs
deleted file mode 100644
index fa37486e9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieChart.xaml.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Data;
-
-namespace Samples.Modules.Pie.Views
-{
-  /// <summary>
-  /// Interaction logic for PieChart.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class PieChart : DemoView
-  {
-    public PieChart()
-    {
-      InitializeComponent();
-    }
-  }
-
-  public class SliceLabelConverter : IValueConverter
-  {
-    public object Convert( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return ( ( double )value ).ToString( "#.#% " + parameter );
-    }
-
-    public object ConvertBack( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new System.NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml
deleted file mode 100644
index 7c5977234..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml
+++ /dev/null
@@ -1,103 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Pie.Views.PieProgress"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Samples.Modules.Pie.Views"
-                 Title="Progress"
-                 Description="The Pie control properties can be animated to create various effects and controls like this circular progress bar">
-
-   <sample:DemoView.Resources>
-      <ControlTemplate x:Key="PieProgressTemplate"
-                       TargetType="{x:Type ProgressBar}">
-         <Grid>
-            <xctk:Pie x:Name="Pie"
-                      Fill="#FF3F4A7F"
-                      HorizontalAlignment="Stretch"
-                      Width="Auto"
-                      StrokeThickness="4"
-                      Slice="{TemplateBinding Value}"
-                      RenderTransformOrigin="0.5,0.5">
-               <xctk:Pie.RenderTransform>
-                  <RotateTransform Angle="-90" />
-               </xctk:Pie.RenderTransform>
-            </xctk:Pie>
-            <Ellipse Fill="White"
-                     HorizontalAlignment="Center"
-                     VerticalAlignment="Center"
-                     Width="100"
-                     Height="100" />
-            <StackPanel HorizontalAlignment="Center"
-                        VerticalAlignment="Center"
-                        Orientation="Horizontal">
-               <TextBlock  FontSize="24"
-                           FontWeight="Bold"
-                           Foreground="Black"
-                           Text="{Binding ElementName=Pie, Path=Slice, StringFormat=#%}" />
-            </StackPanel>
-         </Grid>
-      </ControlTemplate>
-      <Storyboard x:Key="SimulateProgressStoryboard"
-                  Duration="00:00:04"
-                  AccelerationRatio="0.5"
-                  DecelerationRatio="0.5">
-         <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
-                                        Storyboard.TargetName="progressBar"
-                                        Storyboard.TargetProperty="(RangeBase.Value)">
-            <SplineDoubleKeyFrame KeyTime="00:00:00"
-                                  Value="0" />
-            <SplineDoubleKeyFrame KeyTime="00:00:04"
-                                  Value="1" />
-         </DoubleAnimationUsingKeyFrames>
-      </Storyboard>
-   </sample:DemoView.Resources>
-
-   <sample:DemoView.Triggers>
-      <EventTrigger RoutedEvent="ButtonBase.Click"
-                    SourceName="SimulateProgressButton">
-         <BeginStoryboard Storyboard="{StaticResource SimulateProgressStoryboard}" />
-      </EventTrigger>
-   </sample:DemoView.Triggers>
-
-   <Grid x:Name="LayoutRoot"
-         HorizontalAlignment="Center"
-         VerticalAlignment="Center">
-      <Grid.RowDefinitions>
-         <RowDefinition Height="0.66*" />
-         <RowDefinition Height="Auto" />
-      </Grid.RowDefinitions>
-      <ProgressBar x:Name="progressBar"
-                   Template="{StaticResource PieProgressTemplate}"
-                   Value="0"
-                   Height="200"
-                   Width="200"
-                   Minimum="0"
-                   Maximum="1" />
-      <Button x:Name="SimulateProgressButton"
-              Content="Simulate Progress"
-              HorizontalAlignment="Center"
-              Margin="0,20,0,0"
-              VerticalAlignment="Center"
-              Width="200"
-              Height="50"
-              Grid.Row="1" />
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs
deleted file mode 100644
index c040608f3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Pie/Views/PieProgress.xaml.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Data;
-
-namespace Samples.Modules.Pie.Views
-{
-  /// <summary>
-  /// Interaction logic for PieProgress.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class PieProgress : DemoView
-  {
-    public PieProgress()
-    {
-      InitializeComponent();
-    }
-  }
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
deleted file mode 100644
index 403de9dba..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit PropertyGrid Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit PropertyGrid Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
deleted file mode 100644
index c705731a6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.PropertyGrid.Views;
-
-namespace Samples.Modules.PropertyGrid
-{
-  public class PropertyGridModule : ModuleBase
-  {
-    public PropertyGridModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-      Container.RegisterNavigationType( typeof( CustomEditors ) );
-      Container.RegisterNavigationType( typeof( CustomItemsSource ) );
-      Container.RegisterNavigationType( typeof( DefaultEditors ) );
-      Container.RegisterNavigationType( typeof( ExpandableProperties ) );
-      Container.RegisterNavigationType( typeof( SpecifyingProperties ) );
-      Container.RegisterNavigationType( typeof( BindingToStructs ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
deleted file mode 100644
index 449352bdc..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<UserControl x:Class="Samples.Modules.PropertyGrid.LastNameUserControlEditor"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             x:Name="_uc">
-   <StackPanel>
-      <TextBox Text="{Binding Value, ElementName=_uc}" Background="YellowGreen" />
-      <Button Click="Button_Click">Clear</Button>
-   </StackPanel>
-</UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj
deleted file mode 100644
index be3aa4d42..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Samples.Modules.PropertyGrid.csproj
+++ /dev/null
@@ -1,168 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{511FB369-57D2-430B-9002-F367DF165E70}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.PropertyGrid</RootNamespace>
-    <AssemblyName>Samples.Modules.PropertyGrid</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Resources\LastNameUserControlEditor.xaml.cs">
-      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="PropertyGridModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\BindingToStructs.xaml.cs">
-      <DependentUpon>BindingToStructs.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomEditors.xaml.cs">
-      <DependentUpon>CustomEditors.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\CustomItemsSource.xaml.cs">
-      <DependentUpon>CustomItemsSource.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DefaultEditors.xaml.cs">
-      <DependentUpon>DefaultEditors.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\DisplayLocalizationRes.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>DisplayLocalizationRes.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Views\ExpandableProperties.xaml.cs">
-      <DependentUpon>ExpandableProperties.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\SpecifyingProperties.xaml.cs">
-      <DependentUpon>SpecifyingProperties.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Resources\LastNameUserControlEditor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\BindingToStructs.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomEditors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\CustomItemsSource.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\DefaultEditors.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\ExpandableProperties.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\SpecifyingProperties.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\DisplayLocalizationRes.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>DisplayLocalizationRes.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Views\DisplayLocalizationRes.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y /S
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
deleted file mode 100644
index 9842048f8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
+++ /dev/null
@@ -1,59 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.BindingToStructs"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Samples.Modules.PropertyGrid.Views"
-                 Title="Binding to Structs"
-                 Description="When the SelectedObject contains properties of type Struct youmay find that edits performed in the PropertyGrid do not function properly.  This is because Structs are passed by value.  Meaning that the PropertyGrid receives a copy of the Struct and not a reference.  When this happens, the data binding expressions end up binding to and modifying that copy rather than the original values.">
-
-   <sample:DemoView.Resources>
-      <local:DimensionsConverter x:Key="DimensionsConverter" />
-   </sample:DemoView.Resources>
-   <StackPanel Grid.Row="1" Margin="10">
-      <TextBlock Text="Binding to Structs:" Style="{StaticResource Header}" />
-      <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
-      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10">
-         <xctk:PropertyGrid.EditorDefinitions>
-            <xctk:EditorDefinition TargetType="{x:Type local:Dimension}">
-               <xctk:EditorDefinition.EditorTemplate>
-                  <DataTemplate>
-                     <Grid Margin="5">
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Grid.ColumnDefinitions>
-                           <ColumnDefinition Width="Auto" />
-                           <ColumnDefinition Width="*" />
-                        </Grid.ColumnDefinitions>
-                        <TextBlock Text="Height: " />
-                        <TextBox Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Height}" />
-                        <TextBlock Grid.Row="1" Text="Weight: " />
-                        <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Weight}" />
-                     </Grid>
-                  </DataTemplate>
-               </xctk:EditorDefinition.EditorTemplate>
-            </xctk:EditorDefinition>
-         </xctk:PropertyGrid.EditorDefinitions>
-      </xctk:PropertyGrid>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
deleted file mode 100644
index 4fc03c8a5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
+++ /dev/null
@@ -1,119 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows.Data;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for BindingToStructs.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class BindingToStructs : DemoView
-  {
-    public BindingToStructs()
-    {
-      InitializeComponent();
-      _propertyGrid.SelectedObject = Person.CreatePerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      public Dimension Dimensions
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.Dimensions = new Dimension()
-        {
-          Height = 75.0,
-          Weight = 185.76
-        };
-        return person;
-      }
-    }
-  }
-
-  public struct Dimension
-  {
-    public double Height;
-    public double Weight;
-
-    public Dimension( double height, double weight )
-    {
-      this.Height = height;
-      this.Weight = weight;
-    }
-  }
-
-  public class DimensionsConverter : IValueConverter
-  {
-    static Dimension _originalValue; // the static struct that stores original value at the start of editing
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      _originalValue = ( ( Dimension )value );
-
-      if( parameter.ToString() == "Height" )
-        return ( ( Dimension )value ).Height;
-      if( parameter.ToString() == "Weight" )
-        return ( ( Dimension )value ).Weight;
-
-      return _originalValue;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( parameter.ToString() == "Height" )
-        _originalValue = new Dimension( double.Parse( value.ToString() ), _originalValue.Weight );
-      if( parameter.ToString() == "Weight" )
-        _originalValue = new Dimension( _originalValue.Height, double.Parse( value.ToString() ) );
-
-      return _originalValue;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
deleted file mode 100644
index c07118ce5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
+++ /dev/null
@@ -1,86 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomEditors"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 Title="Custom Editors"
-                 Description="This example demonstrates the various methods of creating and using custom editors.  You can supply your own editor based on a Type, a property name, or both.  To supply your own editor for a property you have to create an EditorDefinition for the PropertyGrid.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="*" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <StackPanel Grid.Row="0" Margin="10">
-         <TextBlock Text="Custom Editors with a DataTemplate:" Style="{StaticResource Header}" />
-         <TextBlock Text="You can override the default editors with your own custom editors with a DataTemplate.  Simply define an EditorDefinition that either targets a Type, property name, or both and set the EditorDefinition.EditorTemplate to an instance of a DataTemplate.  Be sure to bind your custom editor to the bound property item's Value property." TextWrapping="Wrap" />
-         <xctk:PropertyGrid x:Name="_propertyGrid1" Width="450"  Margin="10">
-            <xctk:PropertyGrid.EditorDefinitions>
-
-               <!-- This EditorDefinition will provide a TextBox to any property that is of type HorizontalAlignment, replacing the default ComboBox editor. -->
-               <xctk:EditorDefinition TargetType="{x:Type HorizontalAlignment}">
-                  <xctk:EditorDefinition.EditorTemplate>
-                     <DataTemplate>
-                        <TextBox Background="Green"  Text="{Binding Value}" />
-                        <!-- Always bind your editor's value to the bound property's Value -->
-                     </DataTemplate>
-                  </xctk:EditorDefinition.EditorTemplate>
-               </xctk:EditorDefinition>
-
-               <!-- This EditorDefinition will provide a TextBlock to any property that has any of the defined property names, replacing the default editor. -->
-               <xctk:EditorDefinition>
-                  <xctk:EditorDefinition.PropertiesDefinitions>
-                     <xctk:PropertyDefinition Name="Age" />
-                     <xctk:PropertyDefinition Name="WritingFont" />
-                     <xctk:PropertyDefinition Name="Spouse" />
-                  </xctk:EditorDefinition.PropertiesDefinitions>
-                  <xctk:EditorDefinition.EditorTemplate>
-                     <DataTemplate>
-                        <TextBlock Background="Yellow" Text="{Binding Value}" />
-                     </DataTemplate>
-                  </xctk:EditorDefinition.EditorTemplate>
-               </xctk:EditorDefinition>
-
-               <!-- This EditorDefinition will provide a TextBox to any property that is of type Boolean or that has any of the defined property names, replacing the default editor. -->
-               <xctk:EditorDefinition TargetType="{x:Type sys:Boolean}">
-                  <xctk:EditorDefinition.PropertiesDefinitions>
-                     <xctk:PropertyDefinition Name="DateOfBirth" />
-                     <xctk:PropertyDefinition Name="LastName" />
-                  </xctk:EditorDefinition.PropertiesDefinitions>
-                  <xctk:EditorDefinition.EditorTemplate>
-                     <DataTemplate>
-                        <TextBox Background="Red" Text="{Binding Value}" />
-                     </DataTemplate>
-                  </xctk:EditorDefinition.EditorTemplate>
-               </xctk:EditorDefinition>
-
-            </xctk:PropertyGrid.EditorDefinitions>
-         </xctk:PropertyGrid>
-      </StackPanel>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Custom Editors with an Attribute:" Style="{StaticResource Header}" />
-         <TextBlock Text="You can supply editors for a property by using the System.ComponentModel.EditorAttribute.  In order to provide an editor with an attribute, the editor MUST implement the ITypeEditor interface.  Your editor can be a simple class or a complex UserControl." TextWrapping="Wrap" />
-         <xctk:PropertyGrid x:Name="_propertyGrid2" Width="450" Margin="10" />
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
deleted file mode 100644
index 89127833e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
+++ /dev/null
@@ -1,246 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for CustomEditors.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class CustomEditors : DemoView
-  {
-    public CustomEditors()
-    {
-      InitializeComponent();
-      _propertyGrid1.SelectedObject = Person.CreatePerson();
-      _propertyGrid2.SelectedObject = CustomAttributEditorPerson.CreateCustomAttributEditorPerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Date of Birth" )]
-      [Description( "This property uses the DateTimeUpDown as the default editor." )]
-      public DateTime DateOfBirth
-      {
-        get;
-        set;
-      }
-
-      [DisplayName( "Grade Point Average" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double GradePointAvg
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [Description( "This property uses the IntegerUpDown as the default editor." )]
-      public int Age
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Is Male" )]
-      [Description( "This property uses a CheckBox as the default editor." )]
-      public bool IsMale
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Favorite Color" )]
-      [Description( "This property uses the ColorPicker as the default editor." )]
-      public Color FavoriteColor
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Hand" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public HorizontalAlignment WritingHand
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public FontFamily WritingFont
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font Size" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double WritingFontSize
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [DisplayName( "Pet Names" )]
-      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<String> PetNames
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property uses the CollectionEditor as the default editor." )]
-      public List<Person> Friends
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property is a complex property and has no default editor." )]
-      public Person Spouse
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.DateOfBirth = new DateTime( 1975, 1, 23 );
-        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-        person.GradePointAvg = 3.98;
-        person.IsMale = true;
-        person.FavoriteColor = Colors.Blue;
-        person.WritingHand = System.Windows.HorizontalAlignment.Right;
-        person.WritingFont = new FontFamily( "Arial" );
-        person.WritingFontSize = 12.5;
-        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-        person.Spouse = new Person()
-        {
-          FirstName = "Jane",
-          LastName = "Doe"
-        };
-        return person;
-      }
-    }
-
-    public class CustomAttributEditorPerson
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      //This custom editor is a Class that implements the ITypeEditor interface
-      [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      //This custom editor is a UserControl that implements the ITypeEditor interface
-      [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Date of Birth" )]
-      [Description( "This property uses the DateTimeUpDown as the default editor." )]
-      public DateTime DateOfBirth
-      {
-        get;
-        set;
-      }
-
-      public static CustomAttributEditorPerson CreateCustomAttributEditorPerson()
-      {
-        var person = new CustomAttributEditorPerson();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.DateOfBirth = new DateTime( 1975, 1, 23 );
-        return person;
-      }
-    }
-  }
-
-  //Custom editors that are used as attributes MUST implement the ITypeEditor interface.
-  public class FirstNameEditor : Xceed.Wpf.Toolkit.PropertyGrid.Editors.ITypeEditor
-  {
-    public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
-    {
-      TextBox textBox = new TextBox();
-      textBox.Background = new SolidColorBrush( Colors.Red );
-
-      //create the binding from the bound property item to the editor
-      var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
-      _binding.Source = propertyItem;
-      _binding.ValidatesOnExceptions = true;
-      _binding.ValidatesOnDataErrors = true;
-      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-      BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
-      return textBox;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
deleted file mode 100644
index 18bbf862d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomItemsSource"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Custom ItemsSource"
-                 Description="Sometimes it is desirable to want to provide a collection of values represented by a ComboBox for a given property.  The PropertyGrid supports this scenario by create a class that implements IItemsSource and decorating your property with the ItemsSourceAttribute.">
-   <StackPanel Margin="10">
-      <TextBlock Text="Providing a Custom ItemsSource:" Style="{StaticResource Header}" />
-      <TextBlock Text="This example uses a collection of Doubles to represent the available options for the WritingFontSize property." TextWrapping="Wrap" />
-      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
deleted file mode 100644
index 09ab7b2b6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for CustomItemsSource.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class CustomItemsSource : DemoView
-  {
-    public CustomItemsSource()
-    {
-      InitializeComponent();
-      _propertyGrid.SelectedObject = Person.CreatePerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Date of Birth" )]
-      [Description( "This property uses the DateTimeUpDown as the default editor." )]
-      public DateTime DateOfBirth
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Hand" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public HorizontalAlignment WritingHand
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public FontFamily WritingFont
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font Size" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      [ItemsSource( typeof( FontSizeItemsSource ) )]
-      public double WritingFontSize
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.DateOfBirth = new DateTime( 1975, 1, 23 );
-        person.WritingHand = System.Windows.HorizontalAlignment.Right;
-        person.WritingFont = new FontFamily( "Arial" );
-        person.WritingFontSize = 12.0;
-        return person;
-      }
-    }
-  }
-
-  public class FontSizeItemsSource : IItemsSource
-  {
-    public ItemCollection GetValues()
-    {
-      ItemCollection sizes = new ItemCollection();
-      sizes.Add( 5.0, "Five" );
-      sizes.Add( 5.5 );
-      sizes.Add( 6.0, "Six" );
-      sizes.Add( 6.5 );
-      sizes.Add( 7.0, "Seven" );
-      sizes.Add( 7.5 );
-      sizes.Add( 8.0, "Eight" );
-      sizes.Add( 8.5 );
-      sizes.Add( 9.0, "Nine" );
-      sizes.Add( 9.5 );
-      sizes.Add( 10.0 );
-      sizes.Add( 12.0, "Twelve" );
-      sizes.Add( 14.0 );
-      sizes.Add( 16.0 );
-      sizes.Add( 18.0 );
-      sizes.Add( 20.0 );
-      return sizes;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
deleted file mode 100644
index 3c6388687..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.DefaultEditors"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Default Editors"
-                 Description="This example demonstrates the default editors provided by the PropertyGrid.">
-   <StackPanel Margin="10">
-      <TextBlock Text="Default Editors:" Style="{StaticResource Header}" />
-      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
deleted file mode 100644
index 7f5bb6096..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for DefaultEditors.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class DefaultEditors : DemoView
-  {
-    public DefaultEditors()
-    {
-      InitializeComponent();
-      _propertyGrid.SelectedObject = Person.CreatePerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Date of Birth" )]
-      [Description( "This property uses the DateTimeUpDown as the default editor." )]
-      public DateTime DateOfBirth
-      {
-        get;
-        set;
-      }
-
-      [DisplayName( "Grade Point Average" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double GradePointAvg
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [Description( "This property uses the IntegerUpDown as the default editor." )]
-      public int Age
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Is Male" )]
-      [Description( "This property uses a CheckBox as the default editor." )]
-      public bool IsMale
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Favorite Color" )]
-      [Description( "This property uses the ColorPicker as the default editor." )]
-      public Color FavoriteColor
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Hand" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public HorizontalAlignment WritingHand
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public FontFamily WritingFont
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font Size" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double WritingFontSize
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [DisplayName( "Pet Names" )]
-      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<String> PetNames
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property uses the CollectionEditor as the default editor." )]
-      public List<Person> Friends
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property is a complex property and has no default editor." )]
-      public Person Spouse
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.DateOfBirth = new DateTime( 1975, 1, 23 );
-        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-        person.GradePointAvg = 3.98;
-        person.IsMale = true;
-        person.FavoriteColor = Colors.Blue;
-        person.WritingHand = System.Windows.HorizontalAlignment.Right;
-        person.WritingFont = new FontFamily( "Arial" );
-        person.WritingFontSize = 12.5;
-        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-        person.Spouse = new Person()
-        {
-          FirstName = "Jane",
-          LastName = "Doe"
-        };
-        return person;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
deleted file mode 100644
index d968f69c1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
+++ /dev/null
@@ -1,31 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.ExpandableProperties"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Exandable Properties"
-                 Description="Sometimes it is neccessary to show the properties of a complex object.  The PropertyGrid supports this scenario and allows you to drill down into a property's heirarchy.  To enable this behavior you must decorate your property with the ExpandableObject attribute.">
-   <StackPanel Margin="10">
-      <TextBlock Text="Expandable Properties:" Style="{StaticResource Header}" />
-      <TextBlock Text="In this example the Spouse property has been decorated with the ExpandableObject attribute.  Notice how you can drill down into the Spouse properties." TextWrapping="Wrap" />
-      <xctk:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"  />
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
deleted file mode 100644
index 936a4cae8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.ComponentModel;
-using System.Windows.Media;
-using Samples.Infrastructure.Controls;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for ExpandableProperties.xaml
-  /// </summary>
-  public partial class ExpandableProperties : DemoView
-  {
-    public ExpandableProperties()
-    {
-      InitializeComponent();
-      _propertyGrid.SelectedObject = Person.CreatePerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public FontFamily WritingFont
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font Size" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double WritingFontSize
-      {
-        get;
-        set;
-      }
-
-
-      [Category( "Conections" )]
-      [Description( "This property is a complex property and has no default editor." )]
-      [ExpandableObject]
-      public Person Spouse
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.WritingFont = new FontFamily( "Arial" );
-        person.WritingFontSize = 12.5;
-        person.Spouse = new Person()
-        {
-          FirstName = "Jane",
-          LastName = "Doe",
-          WritingFont = new FontFamily( "Arial" ),
-          WritingFontSize = 10.5
-        };
-        return person;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
deleted file mode 100644
index 27f12704d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
+++ /dev/null
@@ -1,91 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="PropertyGrid" 
-                 Description="The PropertyGrid control allows you inspect and edit properties of an object.  This PropertyGrid allows you do autogenerate all properties or specify the specific properties you want to display.  You can use the standard editors that are provided with the PropertyGrid or you can use custom editors that target a Type, specific properties, or both.  The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*"/>
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Show Sumary:" VerticalAlignment="Center" />
-            <CheckBox x:Name="_showSummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
-
-            <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
-            <xctk:WatermarkTextBox x:Name="_filter" 
-                                   Grid.Row="1" 
-                                   Grid.Column="1"
-                                   Watermark="Search" 
-                                   VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid." />
-
-            <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" />
-            <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid." />
-
-            <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" />
-            <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
-            <TextBlock Text="IsReadOnly:" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" />
-            <CheckBox x:Name="_isReadOnly" Grid.Row="2" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ToolTip="Set the IsReadOnly property to true or false." />            
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <TextBlock Text="To inspect an object simply set the PropertyGrid.SelectedObject property to an instance of the object you want to inspect. Click the button to inspect"
-                       TextWrapping="Wrap" />
-         <Grid Height="400" Margin="10">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <StackPanel>
-                <Button x:Name="_button1" Click="OnButtonClick" Height="200" Width="200" Margin="25" HorizontalAlignment="Center" VerticalAlignment="Center">Inspect This</Button>
-                <Button x:Name="_button2" Click="OnButtonClick" Foreground="Red" FontSize="22" FontFamily="Bell MT" Height="50" Width="200" Margin="25" HorizontalAlignment="Center" VerticalAlignment="Center">Inspect That</Button>
-            </StackPanel>
-
-            <xctk:PropertyGrid Grid.Column="1"
-                               x:Name="_propertyGrid"
-                               ShowSummary="{Binding IsChecked, ElementName=_showSummary}"
-                               Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
-                               IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
-                               ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}" 
-                               IsReadOnly="{Binding IsChecked, ElementName=_isReadOnly}"/>
-         </Grid>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
deleted file mode 100644
index a0a8d2538..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void OnButtonClick( object sender, EventArgs e )
-    {
-      _propertyGrid.SelectedObject = sender;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
deleted file mode 100644
index 154117681..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.PropertyGrid.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.PropertyGrid.Views"
-              Header="PropertyGrid" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-   <TreeViewItem Header="Editors">
-      <TreeViewItem Header="Default Editors" Tag="{x:Type views:DefaultEditors}" />
-      <TreeViewItem Header="Custom Editors" Tag="{x:Type views:CustomEditors}" />
-   </TreeViewItem>
-   <TreeViewItem Header="Properties">
-      <TreeViewItem Header="Binding to Structs" Tag="{x:Type views:BindingToStructs}" />
-      <TreeViewItem Header="Expandable Properties" Tag="{x:Type views:ExpandableProperties}" />
-      <TreeViewItem Header="Providing an ItemsSource" Tag="{x:Type views:CustomItemsSource}" />
-      <TreeViewItem Header="Specifying Properties" Tag="{x:Type views:SpecifyingProperties}" />
-   </TreeViewItem>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
deleted file mode 100644
index 34eaf909a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
deleted file mode 100644
index c3bfbaa48..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.PropertyGrid.Views.SpecifyingProperties"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Specifying Properties"
-                 Description="By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show.">
-   <StackPanel Grid.Row="1" Margin="10">
-      <TextBlock Text="Specifying Properties:" Style="{StaticResource Header}" />
-      <xctk:PropertyGrid x:Name="_propertyGrid" 
-                            Width="450" 
-                            Margin="10"
-                            AutoGenerateProperties="False">
-         <!-- Only the following properties will be displayed in the PropertyGrid -->
-         <xctk:PropertyGrid.PropertyDefinitions>
-            <xctk:PropertyDefinition Name="FirstName" />
-            <xctk:PropertyDefinition Name="FavoriteColor" />
-            <xctk:PropertyDefinition Name="PetNames" />
-         </xctk:PropertyGrid.PropertyDefinitions>
-      </xctk:PropertyGrid>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
deleted file mode 100644
index 374164d21..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
+++ /dev/null
@@ -1,181 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.PropertyGrid.Views
-{
-  /// <summary>
-  /// Interaction logic for SpecifyingProperties.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class SpecifyingProperties : DemoView
-  {
-    public SpecifyingProperties()
-    {
-      InitializeComponent();
-      _propertyGrid.SelectedObject = Person.CreatePerson();
-    }
-
-    public class Person
-    {
-      [Category( "Information" )]
-      [DisplayName( "First Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string FirstName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Last Name" )]
-      [Description( "This property uses a TextBox as the default editor." )]
-      public string LastName
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Date of Birth" )]
-      [Description( "This property uses the DateTimeUpDown as the default editor." )]
-      public DateTime DateOfBirth
-      {
-        get;
-        set;
-      }
-
-      [DisplayName( "Grade Point Average" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double GradePointAvg
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [Description( "This property uses the IntegerUpDown as the default editor." )]
-      public int Age
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Is Male" )]
-      [Description( "This property uses a CheckBox as the default editor." )]
-      public bool IsMale
-      {
-        get;
-        set;
-      }
-
-      [Category( "Information" )]
-      [DisplayName( "Favorite Color" )]
-      [Description( "This property uses the ColorPicker as the default editor." )]
-      public Color FavoriteColor
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Hand" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public HorizontalAlignment WritingHand
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font" )]
-      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
-      public FontFamily WritingFont
-      {
-        get;
-        set;
-      }
-
-      [Category( "Writing" )]
-      [DisplayName( "Writing Font Size" )]
-      [Description( "This property uses the DoubleUpDown as the default editor." )]
-      public double WritingFontSize
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [DisplayName( "Pet Names" )]
-      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<String> PetNames
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property uses the CollectionEditor as the default editor." )]
-      public List<Person> Friends
-      {
-        get;
-        set;
-      }
-
-      [Category( "Conections" )]
-      [Description( "This property is a complex property and has no default editor." )]
-      public Person Spouse
-      {
-        get;
-        set;
-      }
-
-      public static Person CreatePerson()
-      {
-        var person = new Person();
-        person.FirstName = "John";
-        person.LastName = "Doe";
-        person.DateOfBirth = new DateTime( 1975, 1, 23 );
-        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-        person.GradePointAvg = 3.98;
-        person.IsMale = true;
-        person.FavoriteColor = Colors.Blue;
-        person.WritingHand = System.Windows.HorizontalAlignment.Right;
-        person.WritingFont = new FontFamily( "Arial" );
-        person.WritingFontSize = 12.5;
-        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-        person.Spouse = new Person()
-        {
-          FirstName = "Jane",
-          LastName = "Doe"
-        };
-        return person;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
deleted file mode 100644
index 264e54b6d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Text Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Text Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt
deleted file mode 100644
index 72443a9f6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/PlainData.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-﻿This is the RichTextBox
-in Plain Format
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt
deleted file mode 100644
index 3d527eb91..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/RtfData.txt
+++ /dev/null
@@ -1 +0,0 @@
-﻿ {\rtf1\ansi\ansicpg1252\uc1\htmautsp\deff2{\fonttbl{\f0\fcharset0 Times New Roman;}{\f2\fcharset0 Segoe UI;}}{\colortbl\red0\green0\blue0;\red255\green255\blue255;}\loch\hich\dbch\pard\plain\ltrpar\itap0{\lang1033\fs18\f2\cf0 \cf0\ql{\f2 {\ltrch This is the }{\b\ltrch RichTextBox}{\ltrch  in Rtf Format }\li0\ri0\sa0\sb0\fi0\ql\par}}}
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt
deleted file mode 100644
index baa769468..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Resources/XamlData.txt
+++ /dev/null
@@ -1 +0,0 @@
-﻿<Section xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xml:space="preserve" TextAlignment="Left" LineHeight="Auto" IsHyphenationEnabled="False" xml:lang="en-us" FlowDirection="LeftToRight" NumberSubstitution.CultureSource="User" NumberSubstitution.Substitution="AsCulture" FontFamily="Segoe UI" FontStyle="Normal" FontWeight="Normal" FontStretch="Normal" FontSize="12" Foreground="#FF000000" Typography.StandardLigatures="True" Typography.ContextualLigatures="True" Typography.DiscretionaryLigatures="False" Typography.HistoricalLigatures="False" Typography.AnnotationAlternates="0" Typography.ContextualAlternates="True" Typography.HistoricalForms="False" Typography.Kerning="True" Typography.CapitalSpacing="False" Typography.CaseSensitiveForms="False" Typography.StylisticSet1="False" Typography.StylisticSet2="False" Typography.StylisticSet3="False" Typography.StylisticSet4="False" Typography.StylisticSet5="False" Typography.StylisticSet6="False" Typography.StylisticSet7="False" Typography.StylisticSet8="False" Typography.StylisticSet9="False" Typography.StylisticSet10="False" Typography.StylisticSet11="False" Typography.StylisticSet12="False" Typography.StylisticSet13="False" Typography.StylisticSet14="False" Typography.StylisticSet15="False" Typography.StylisticSet16="False" Typography.StylisticSet17="False" Typography.StylisticSet18="False" Typography.StylisticSet19="False" Typography.StylisticSet20="False" Typography.Fraction="Normal" Typography.SlashedZero="False" Typography.MathematicalGreek="False" Typography.EastAsianExpertForms="False" Typography.Variants="Normal" Typography.Capitals="Normal" Typography.NumeralStyle="Normal" Typography.NumeralAlignment="Normal" Typography.EastAsianWidths="Normal" Typography.EastAsianLanguage="Normal" Typography.StandardSwashes="0" Typography.ContextualSwashes="0" Typography.StylisticAlternates="0"><Paragraph><Run>This is the </Run><LineBreak/><Run FontWeight="Bold">RichTextBox</Run><LineBreak/><Run>in XAML Format</Run></Paragraph></Section>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
deleted file mode 100644
index 9e4499ca7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Samples.Modules.Text.csproj
+++ /dev/null
@@ -1,145 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Text</RootNamespace>
-    <AssemblyName>Samples.Modules.Text</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="TextModule.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\AutoSelectTextBoxView.xaml.cs">
-      <DependentUpon>AutoSelectTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MaskedTextBoxView.xaml.cs">
-      <DependentUpon>MaskedTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\MultiLineTextEditorView.xaml.cs">
-      <DependentUpon>MultiLineTextEditorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\RichTextBoxView.xaml.cs">
-      <DependentUpon>RichTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\WatermarkTextBoxView.xaml.cs">
-      <DependentUpon>WatermarkTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\AutoSelectTextBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\HomeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\MaskedTextBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\MultiLineTextEditorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\RichTextBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Views\WatermarkTextBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\PlainData.txt" />
-    <Resource Include="Resources\RtfData.txt" />
-    <Resource Include="Resources\XamlData.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\PencilTool16.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
deleted file mode 100644
index 1f0db4f13..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Text.Views;
-
-namespace Samples.Modules.Text
-{
-  public class TextModule : ModuleBase
-  {
-    public TextModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-      Container.RegisterNavigationType( typeof( MaskedTextBoxView ) );
-      Container.RegisterNavigationType( typeof( MultiLineTextEditorView ) );
-      Container.RegisterNavigationType( typeof( RichTextBoxView ) );
-      Container.RegisterNavigationType( typeof( WatermarkTextBoxView ) );
-      Container.RegisterNavigationType( typeof( AutoSelectTextBoxView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml
deleted file mode 100644
index 5df1f011a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml
+++ /dev/null
@@ -1,118 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Text.Views.AutoSelectTextBoxView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="AutoSelectTextBox"
-                 Description="The AutoSelectTextBox allows the text content to be selected when the control get the focus. It also allows the Focus navigation behavior within the control to be affected.">
-   <StackPanel>
-      <StackPanel.Resources>
-         <Style TargetType="{x:Type xctk:AutoSelectTextBox}">
-            <Setter Property="Margin" Value="5"/>
-            <Setter Property="AutoSelectBehavior" Value="{Binding SelectedItem, ElementName=_autoSelectBehavior}"/>
-            <Setter Property="AutoMoveFocus" Value="{Binding IsChecked, ElementName=_autoMoveFocus}"/>
-         </Style>
-      </StackPanel.Resources>
-
-      <!-- FEATURES GROUP BOX -->
-      <GroupBox Header="Features" >
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition />
-               <ColumnDefinition />
-            </Grid.ColumnDefinitions>
-            <StackPanel Orientation="Horizontal" Grid.Column="0">
-               <TextBlock Grid.Row="0" Grid.Column="0" Text="AutoSelectBehavior: " VerticalAlignment="Center" />
-               <ComboBox Grid.Row="0" Grid.Column="1" x:Name="_autoSelectBehavior" SelectedIndex="1" Width="100" VerticalAlignment="Center">
-                  <x:StaticExtension Member="xctk:AutoSelectBehavior.Never" />
-                  <x:StaticExtension Member="xctk:AutoSelectBehavior.OnFocus" />
-               </ComboBox>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal" Grid.Column="1">
-               <TextBlock Grid.Row="0" Grid.Column="2" Text="AutoMoveFocus:  " VerticalAlignment="Center" />
-               <CheckBox Grid.Row="0" Grid.Column="3" x:Name="_autoMoveFocus" IsChecked="True" VerticalAlignment="Center"/>
-            </StackPanel>
-         </Grid>
-      </GroupBox>
-
-      <StackPanel>
-         <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
-         <RichTextBox IsReadOnly="True" BorderThickness="0">
-            <FlowDocument>
-               <Paragraph>
-                  <Bold>AutoSelectBehavior:</Bold>
-                  <LineBreak/>
-                  The value of the "AutoSelectBehavior" property determines whether the content of the AutoSelectTextBox will be selected or not when the control gets the focus.
-                  <LineBreak/>
-                  <LineBreak/>
-                  <Bold>AutoMoveFocus:</Bold>
-                  <LineBreak/>
-                  <Italic>Effect with "MaxLength" property:</Italic>
-                  <LineBreak/>
-                  <LineBreak/>
-                  Setting the "MaxLength" of the text box allows the focus to move from the AutoSelectTextBox once the max length has been reached.
-               In the following "Telephone Number" fields, the "MaxLength" properties of the controls have been set to 3, 3, and 4.
-               </Paragraph>
-            </FlowDocument>
-         </RichTextBox>
-
-         <!-- PHONE NUMBER FIELDS -->         
-         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-            <TextBlock Text="(" VerticalAlignment="Center"/>
-            <xctk:AutoSelectTextBox MaxLength="3" Width="30" Text="555"/>
-            <TextBlock Text=")" VerticalAlignment="Center"/>
-            <xctk:AutoSelectTextBox MaxLength="3" Width="30" Text="555"/>
-            <TextBlock Text="-" VerticalAlignment="Center"/>
-            <xctk:AutoSelectTextBox MaxLength="4" Width="40" Text="5555"/>
-         </StackPanel>
-         <RichTextBox IsReadOnly="True" BorderThickness="0">
-            <FlowDocument>
-               <Paragraph>
-                  <Italic>Effect with Arrow keys</Italic>
-                  <LineBreak/>
-                  <LineBreak/>
-                  Setting "AutoMoveFocus" to true also allows navigating the focus through the controls using the arrow keys to move the focus up, down, left, or right. 
-               You are no longer limited to the "left-right" navigation of the "Tab, Shift-Tab" keys.
-               </Paragraph>
-            </FlowDocument>
-         </RichTextBox>
-
-         <!-- TEXTBOX MATRIX -->
-         <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
-            <StackPanel Orientation="Horizontal">
-               <xctk:AutoSelectTextBox Text="Text1" Width="100" />
-               <xctk:AutoSelectTextBox Text="Text2" Width="100"/>
-               <xctk:AutoSelectTextBox Text="Text3" Width="100"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-               <xctk:AutoSelectTextBox Text="Text4" Width="100"/>
-               <xctk:AutoSelectTextBox Text="Text5" Width="100"/>
-               <xctk:AutoSelectTextBox Text="Text6" Width="100"/>
-            </StackPanel>
-            <StackPanel Orientation="Horizontal">
-               <xctk:AutoSelectTextBox Text="Text7" Width="100"/>
-               <xctk:AutoSelectTextBox Text="Text8" Width="100"/>
-               <xctk:AutoSelectTextBox Text="Text9" Width="100"/>
-            </StackPanel>
-         </StackPanel>
-      </StackPanel>
-   </StackPanel>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml.cs
deleted file mode 100644
index 6a7dc3405..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/AutoSelectTextBoxView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkTextBoxView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class AutoSelectTextBoxView : DemoView
-  {
-    public AutoSelectTextBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
deleted file mode 100644
index 6ed815c2f..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Text.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Text Controls">
-   <Grid x:Name="layoutRoot">
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
deleted file mode 100644
index 310095f4e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    public class Email
-    {
-      public int Id
-      {
-        get;
-        set;
-      }
-      public string FirstName
-      {
-        get;
-        set;
-      }
-      public string LastName
-      {
-        get;
-        set;
-      }
-      public string EmailAddress
-      {
-        get;
-        set;
-      }
-
-      public string FullName
-      {
-        get
-        {
-          return String.Format( "{0}, {1}", LastName, FirstName );
-        }
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml
deleted file mode 100644
index 3ab8ab7e8..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml
+++ /dev/null
@@ -1,89 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Text.Views.MaskedTextBoxView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:osb="clr-namespace:Xceed.Wpf.Toolkit.Obselete;assembly=Xceed.Wpf.Toolkit"
-                 xmlns:s="clr-namespace:System;assembly=mscorlib"
-                 Title="MaskedTextBox"
-                 Description="The MaskedTextBox control lets you display and edit values based on a mask.">
-   <Grid>
-
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <StackPanel Margin="5">
-            <Grid>
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="Include literals:" VerticalAlignment="Center" Margin="2" />
-               <CheckBox x:Name="_literals" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
-                         IsChecked="{Binding IncludeLiteralsInValue, ElementName=_maskedTextBox, Mode=TwoWay}"/>
-
-               <TextBlock Text="Include prompt:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
-               <CheckBox x:Name="_prompt" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
-                         IsChecked="{Binding IncludePromptInValue, ElementName=_maskedTextBox, Mode=TwoWay}"/>
-            </Grid>
-            <Grid Margin="0,5,0,0">
-               <Grid.RowDefinitions>
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-                  <RowDefinition Height="Auto" />
-               </Grid.RowDefinitions>
-               <Grid.ColumnDefinitions>
-                  <ColumnDefinition Width="Auto" />
-                  <ColumnDefinition Width="*" />
-               </Grid.ColumnDefinitions>
-
-               <TextBlock Text="Mask:" VerticalAlignment="Center" Margin="2" />
-               <TextBox x:Name="_mask" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
-                        Text="{Binding Mask, ElementName=_maskedTextBox, ValidatesOnExceptions=True}" />
-
-               <TextBlock Text="Value:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
-               <TextBox x:Name="_value" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5"
-                        Text="{Binding Value, ElementName=_maskedTextBox, ValidatesOnExceptions=True}"  />
-
-               <TextBlock Text="Text:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
-               <TextBox x:Name="_text" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
-                        Text="{Binding Text, ElementName=_maskedTextBox, ValidatesOnExceptions=True}"/>
-            </Grid>
-         </StackPanel>
-      </GroupBox>
-
-      <StackPanel Grid.Row="1" Margin="10">
-         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-         <xctk:MaskedTextBox x:Name="_maskedTextBox"
-                             Mask="(000) 000-0000"
-                             ValueDataType="{x:Type s:String}" />
-
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs
deleted file mode 100644
index 6d9ff25b7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MaskedTextBoxView.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for MaskedTextBoxView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class MaskedTextBoxView : DemoView
-  {
-    public MaskedTextBoxView()
-    {
-      InitializeComponent();
-      _mask.TextChanged += new System.Windows.Controls.TextChangedEventHandler( _mask_TextChanged );
-    }
-
-    void _mask_TextChanged( object sender, System.Windows.Controls.TextChangedEventArgs e )
-    {
-      _maskedTextBox.Value = null;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml
deleted file mode 100644
index 70dc3365a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml
+++ /dev/null
@@ -1,53 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-
-<sample:DemoView x:Class="Samples.Modules.Text.Views.MultiLineTextEditorView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="MultiLineTextEditor"
-                 Description="The MultiLineTextEditor is a TextBox that allows you to edit text that is too long to display in a regular TextBox. The popup is resizable to accommodate any text.">
-    <sample:DemoView.Resources>
-        <DataTemplate x:Key="multiLineTextEditorStyle" >
-            <xctk:MultiLineTextEditor TextWrapping="Wrap" Text="{Binding Path=Review}" Content="{Binding Text, RelativeSource={RelativeSource Self}}" Height="24" />
-        </DataTemplate>
-    </sample:DemoView.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <DataGrid x:Name="_dataGrid" ItemsSource="{Binding}" AutoGenerateColumns="False" CanUserAddRows="False">
-                <DataGrid.Columns>
-                    <DataGridTextColumn Header="Title" Binding="{Binding Path=Title}" IsReadOnly="True"/>
-                    <DataGridTemplateColumn Header="Review" Width="150" CellTemplate ="{StaticResource multiLineTextEditorStyle}"/>
-                    <DataGridTextColumn Header="Rating" Binding="{Binding Path=Rating}" IsReadOnly="True"/>
-                </DataGrid.Columns>
-            </DataGrid>
-         </StackPanel>
-    </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml.cs
deleted file mode 100644
index 62380b310..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/MultiLineTextEditorView.xaml.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Collections.Generic;
-namespace Samples.Modules.Text.Views
-{
-  public class Movie
-  {
-    public string Title
-    {
-      get;
-      set;
-    }
-
-    public string Review
-    {
-      get;
-      set;
-    }
-
-    public double Rating
-    {
-      get;
-      set;
-    }
-  }
-
-  /// <summary>
-  /// Interaction logic for MultiLineTextEditor.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class MultiLineTextEditorView : DemoView
-  {
-    public MultiLineTextEditorView()
-    {
-      InitializeComponent();
-      _dataGrid.DataContext = InitMovieList();
-    }
-
-    private List<Movie> InitMovieList()
-    {
-      List<Movie> movieList = new List<Movie>();
-      movieList.Add( new Movie()
-      {
-        Title = "Lord Of The Rings",
-        Review = "A great movie with many special effects.",
-        Rating = 9
-      } );
-      movieList.Add( new Movie()
-      {
-        Title = "Pirates Of The Caribbean",
-        Review = "An epic pirate movie with ships, swords, explosions, and a treasure.",
-        Rating = 9.5
-      } );
-      movieList.Add( new Movie()
-      {
-        Title = "Batman",
-        Review = "Batman returns after 8 years, stronger than ever, to deliver Gotham City from a new criminal.",
-        Rating = 7.8
-      } );
-      movieList.Add( new Movie()
-      {
-        Title = "Indiana Jones",
-        Review = "Harrison Ford strikes back for an action-packed movie in the jungle to find a mysterious Crystal skull.",
-        Rating = 6.4
-      } );
-
-      return movieList;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
deleted file mode 100644
index 18964b943..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
+++ /dev/null
@@ -1,35 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Text.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Text.Views"
-              Header="Text" Tag="{x:Type views:HomeView}" >
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-   <TreeViewItem Header="AutoSelectTextBox" Tag="{x:Type views:AutoSelectTextBoxView}" />
-   <TreeViewItem Header="MaskedTextBox" Tag="{x:Type views:MaskedTextBoxView}" />
-    <TreeViewItem Header="MultiLineTextEditor" Tag="{x:Type views:MultiLineTextEditorView}" />
-   <TreeViewItem Header="RichTextBox" Tag="{x:Type views:RichTextBoxView}"/>
-   <TreeViewItem Header="WatermarkTextBox" Tag="{x:Type views:WatermarkTextBoxView}" />
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
deleted file mode 100644
index 8a2d584f9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml
deleted file mode 100644
index 7ca777864..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-
-<sample:DemoView x:Class="Samples.Modules.Text.Views.RichTextBoxView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Samples.Modules.Text.Views"
-                 Title="RichTextBox"
-                 Description="The RichTextBox is a TextBox that allows you to edit formatted text based on TextFormatters. The RichTextBoxFormatBar is a contextual formatting toolbar that mimics the behavior of the Microsoft Office 2010 formatting bar on selection.">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*" />
-        </Grid.RowDefinitions>
-
-        <GroupBox Header="Features" Grid.Row="0" Margin="5">
-            <Grid Margin="5" HorizontalAlignment="Left">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="TextFormatter:" VerticalAlignment="Center" />
-                <ComboBox x:Name="_textFormatter" SelectedIndex="0" SelectionChanged="OnTextFormatterChanged" Grid.Column="1" Width="150" Margin="5" HorizontalAlignment="Left">
-                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.PlainText}">Plain Text</ComboBoxItem>
-                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.Rtf}">RTF</ComboBoxItem>
-                    <ComboBoxItem Tag="{x:Static local:TextFormatterEnum.Xaml}">Xaml</ComboBoxItem>
-                </ComboBox>
-                <TextBlock Text="Text:" Grid.Row="1" VerticalAlignment="Center"/>
-                <TextBox x:Name="_text" Grid.Row="1" Grid.Column="1" TextWrapping="Wrap" IsReadOnly="True" Width="500" Height="70" Margin="5" ScrollViewer.VerticalScrollBarVisibility="Auto"/>
-             </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <xctk:RichTextBox x:Name="_richTextBox" Grid.Column="1" Margin="5" BorderBrush="Gray" Padding="10" Width="350" Text="{Binding ElementName=_text, Path=Text, UpdateSourceTrigger=PropertyChanged}">
-                <xctk:RichTextBoxFormatBarManager.FormatBar>
-                    <xctk:RichTextBoxFormatBar />
-                </xctk:RichTextBoxFormatBarManager.FormatBar>
-            </xctk:RichTextBox>
-        </StackPanel>
-    </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs
deleted file mode 100644
index 38b98ab6d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/RichTextBoxView.xaml.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System;
-using System.Windows.Resources;
-using System.Windows;
-using System.IO;
-namespace Samples.Modules.Text.Views
-{
-  public enum TextFormatterEnum
-  {
-    PlainText,
-    Rtf,
-    Xaml
-  };
-
-  /// <summary>
-  /// Interaction logic for RichTextBox.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class RichTextBoxView : DemoView
-  {
-    public RichTextBoxView()
-    {
-      InitializeComponent();
-    }
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      UpdateValues( _textFormatter );
-    }
-
-    private void OnTextFormatterChanged( object sender, SelectionChangedEventArgs args )
-    {
-      ComboBox comboBox = sender as ComboBox;
-      UpdateValues( comboBox );
-    }
-
-    private void UpdateValues( ComboBox comboBox )
-    {
-      if( ( comboBox != null ) && ( _text != null ) && ( _richTextBox != null ) )
-      {
-        object tagValue = ( ( ComboBoxItem )comboBox.SelectedItem ).Tag;
-        if( object.Equals( TextFormatterEnum.PlainText, tagValue ) )
-        {
-          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/PlainData.txt" );
-          _richTextBox.TextFormatter = new PlainTextFormatter();
-        }
-        else if( object.Equals( TextFormatterEnum.Rtf, tagValue ) )
-        {
-          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/RtfData.txt" );
-          _richTextBox.TextFormatter = new RtfFormatter();
-        }
-        else if( object.Equals( TextFormatterEnum.Xaml, tagValue ) )
-        {
-          _text.Text = GetDataFromResource( "/Samples.Modules.Text;component/Resources/XamlData.txt" );
-          _richTextBox.TextFormatter = new XamlFormatter();
-        }
-      }
-    }
-
-    private string GetDataFromResource( string uriString )
-    {
-      Uri uri = new Uri( uriString, UriKind.Relative );
-      StreamResourceInfo info = Application.GetResourceStream( uri );
-
-      StreamReader reader = new StreamReader( info.Stream );
-      string data = reader.ReadToEnd();
-      reader.Close();
-
-      return data;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
deleted file mode 100644
index 114c1b27a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
+++ /dev/null
@@ -1,64 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Text.Views.WatermarkTextBoxView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="WatermarkTextBox"
-                 Description="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text.">
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0">
-         <Grid Margin="5">
-            <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
-         </Grid>
-      </GroupBox>
-
-      <StackPanel Grid.Row="2" Margin="10">
-         <TextBlock Text="Default:" Style="{StaticResource Header}" />
-         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" />
-
-         <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
-         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
-            <xctk:WatermarkTextBox.Watermark>
-               <StackPanel Orientation="Horizontal">
-                  <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
-                  <TextBlock Text="Enter Text" Margin="4,0,0,0" />
-               </StackPanel>
-            </xctk:WatermarkTextBox.Watermark>
-         </xctk:WatermarkTextBox>
-
-         <TextBlock Grid.Row="1" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
-         <xctk:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
-            <xctk:WatermarkTextBox.WatermarkTemplate>
-               <DataTemplate>
-                  <Border BorderBrush="Green" BorderThickness="1" Padding="5">
-                     <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
-                  </Border>
-               </DataTemplate>
-            </xctk:WatermarkTextBox.WatermarkTemplate>
-         </xctk:WatermarkTextBox>
-      </StackPanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
deleted file mode 100644
index aba00c238..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.Text.Views
-{
-  /// <summary>
-  /// Interaction logic for WatermarkTextBoxView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class WatermarkTextBoxView : DemoView
-  {
-    public WatermarkTextBoxView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Properties/AssemblyInfo.cs
deleted file mode 100644
index 021244fc3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Themes Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Themes Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Samples.Modules.Themes.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Samples.Modules.Themes.csproj
deleted file mode 100644
index 6ee789df5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Samples.Modules.Themes.csproj
+++ /dev/null
@@ -1,134 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{31D6DE81-60F1-4481-BE1B-96768855DA4E}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Themes</RootNamespace>
-    <AssemblyName>Samples.Modules.Themes</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Debug\Samples.Modules.Themes.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisIgnoreBuiltInRuleSets>true</CodeAnalysisIgnoreBuiltInRuleSets>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-    <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
-    <CodeAnalysisFailOnMissingRules>false</CodeAnalysisFailOnMissingRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <CodeAnalysisLogFile>bin\Release\Samples.Modules.Themes.dll.CodeAnalysisLog.xml</CodeAnalysisLogFile>
-    <CodeAnalysisUseTypeNameInSuppression>true</CodeAnalysisUseTypeNameInSuppression>
-    <CodeAnalysisModuleSuppressionsFile>GlobalSuppressions.cs</CodeAnalysisModuleSuppressionsFile>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <CodeAnalysisRuleSetDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets</CodeAnalysisRuleSetDirectories>
-    <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.DataGrid.Samples.SampleData">
-      <HintPath>..\..\..\..\Libs\Xceed.Wpf.DataGrid.Samples.SampleData.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-    <Compile Include="ThemesModule.cs" />
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj">
-      <Project>{63648392-6CE9-4A60-96D4-F9FD718D29B0}</Project>
-      <Name>Xceed.Wpf.DataGrid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\NoPicture.png" />
-    <Resource Include="Images\NoPictureA.jpg" />
-    <Resource Include="Images\NoPictureB.jpg" />
-    <Resource Include="Images\NoPictureC.jpg" />
-    <Resource Include="Images\NoPictureD.jpg" />
-    <Resource Include="Images\Working.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/ThemesModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/ThemesModule.cs
deleted file mode 100644
index c1184bdd1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/ThemesModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Themes.Views;
-
-namespace Samples.Modules.Themes
-{
-  public class ThemesModule : ModuleBase
-  {
-    public ThemesModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml
deleted file mode 100644
index 5cb997faf..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Themes.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 Title="Themes"
-                 x:Name="_demo"
-                 Description="Office themes for all WPF controls, including the toolkit and DataGrid. This feature is offered in the Plus version of the Extended WPF Toolkit.">
-      <TextBlock Margin="0,20,0,0">
-            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Extended WPF Toolkit Plus.
-            </Hyperlink>
-      </TextBlock>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml.cs
deleted file mode 100644
index 4b2933ccf..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using Xceed.Wpf.Toolkit.Themes;
-using System.Windows.Controls.Primitives;
-using System;
-using Xceed.Wpf.DataGrid.Samples.SampleData;
-using System.Data;
-using System.Diagnostics;
-
-namespace Samples.Modules.Themes.Views
-{
-
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void Hyperlink_RequestNavigate( object sender, System.Windows.Navigation.RequestNavigateEventArgs e )
-    {
-      Process.Start( new ProcessStartInfo( e.Uri.AbsoluteUri ) );
-      e.Handled = true;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml
deleted file mode 100644
index 9522b100c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml
+++ /dev/null
@@ -1,30 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Themes.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Themes.Views"
-              Header="Themes" Tag="{x:Type views:HomeView}" Style="{StaticResource plusStyle}">
-
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
-
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml.cs
deleted file mode 100644
index c3e3e69e2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Themes.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
deleted file mode 100644
index e541620f3..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit TimelinePanel Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit TimelinePanel Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
deleted file mode 100644
index b71880520..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Samples.Modules.TimelinePanel.csproj
+++ /dev/null
@@ -1,93 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.TimelinePanel</RootNamespace>
-    <AssemblyName>Samples.Modules.TimelinePanel</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TimelinePanelModule.cs" />
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
deleted file mode 100644
index 571de28d6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/TimelinePanelModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.TimelinePanel.Views;
-
-namespace Samples.Modules.TimelinePanel
-{
-  public class TimelinePanelModule : ModuleBase
-  {
-    public TimelinePanelModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
deleted file mode 100644
index 86a02fdd5..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml
+++ /dev/null
@@ -1,181 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.TimelinePanel.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:pf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 Title="TimelinePanel"
-                 Description="TimelinePanel is a WPF panel at arranges it's children along a timeline.  Items are placed along the timeline based on the Date attached property, which is set on each item.">
-   <sample:DemoView.Resources>
-      <ObjectDataProvider x:Key="Orientations" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="Orientation" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="OverlapBehaviors" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:OverlapBehavior" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-
-      <ControlTemplate x:Key="TimelineItemTemplate"
-                       TargetType="ContentControl">
-         <xctk:DropDownButton DataContext="{Binding ., RelativeSource={RelativeSource TemplatedParent}}"
-                              Content="{TemplateBinding Content}">
-            <xctk:DropDownButton.ContentTemplate>
-               <DataTemplate>
-                  <TextBlock Text="{TemplateBinding Content}" 
-                             TextTrimming="WordEllipsis" 
-                             VerticalAlignment="Center" />
-               </DataTemplate>
-            </xctk:DropDownButton.ContentTemplate>
-
-            <xctk:DropDownButton.DropDownContent>
-               <Border Background="Lavender"
-                       Padding="5">
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*" />
-                        <ColumnDefinition Width="Auto" />
-                     </Grid.ColumnDefinitions>
-
-                     <TextBox Text="{Binding Content, Mode=TwoWay}"
-                           Grid.Row="0"
-                           Grid.Column="0"
-                           Grid.ColumnSpan="2"
-                           VerticalAlignment="Center"
-                           HorizontalContentAlignment="Center" />
-
-                     <TextBlock Text="From"
-                                Grid.Row="1"
-                                Grid.Column="0"
-                                VerticalAlignment="Center"
-                                Margin="0,0,5,0" />
-                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.Date), Mode=TwoWay}"
-                                          Grid.Row="1"
-                                          Grid.Column="1"
-                                          VerticalAlignment="Center"
-                                          Format="ShortDate" />
-
-                     <TextBlock Text="To"
-                                Grid.Row="2"
-                                Grid.Column="0"
-                                VerticalAlignment="Center"
-                                Margin="0,0,5,0" />
-                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.DateEnd), Mode=TwoWay}"
-                                          Grid.Row="2"
-                                          Grid.Column="1"
-                                          VerticalAlignment="Center"
-                                          Format="ShortDate" />
-                  </Grid>
-               </Border>
-            </xctk:DropDownButton.DropDownContent>
-         </xctk:DropDownButton>
-      </ControlTemplate>
-   </sample:DemoView.Resources>
-
-   <Grid>
-
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Orientation:" VerticalAlignment="Center" Margin="2" />
-            <ComboBox Name="_cboOrientation" Grid.Column="1" ItemsSource="{Binding Source={StaticResource Orientations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
-
-            <TextBlock Text="Overlap behavior:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
-            <ComboBox Name="_cboOverlap" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource OverlapBehaviors}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
-
-            <TextBlock Text="Keep original order:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
-            <CheckBox x:Name="_keepOrder" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" IsChecked="True" />
-         </Grid>
-      </GroupBox>
-
-      <xctk:TimelinePanel x:Name="_panel"
-                          Grid.Row="1"
-                          Orientation="{Binding SelectedItem, ElementName=_cboOrientation}"
-                          OverlapBehavior="{Binding SelectedItem, ElementName=_cboOverlap}"
-                          KeepOriginalOrderForOverlap="{Binding IsChecked, ElementName=_keepOrder}">
-
-         <ContentControl xctk:TimelinePanel.Date="2012-01-01T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-01-16T00:00:00"
-                         Content="Event #1"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-02-02T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-02-26T00:00:00"
-                         Content="Event #2"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-02-14T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-03-14T00:00:00"
-                         Content="Event #3"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-02-21T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-03-10T00:00:00"
-                         Content="Event #4"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-05-17T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-06-23T00:00:00"
-                         Content="Event #5"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-06-06T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-08-13T00:00:00"
-                         Content="Event #6"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-08-13T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-09-29T00:00:00"
-                         Content="Event #7"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-         <ContentControl xctk:TimelinePanel.Date="2012-11-01T00:00:00"
-                         xctk:TimelinePanel.DateEnd="2012-12-01T00:00:00"
-                         Content="Event #8"
-                         Template="{StaticResource TimelineItemTemplate}" />
-
-      </xctk:TimelinePanel>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
deleted file mode 100644
index 1a3833e0f..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-
-namespace Samples.Modules.TimelinePanel.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
deleted file mode 100644
index 4adeedfb4..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.TimelinePanel.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.TimelinePanel.Views"
-              Header="TimelinePanel" Tag="{x:Type views:HomeView}">
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
deleted file mode 100644
index 2205a82ba..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.TimelinePanel/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.TimelinePanel.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
deleted file mode 100644
index bd30d9b82..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Wizard Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Wizard Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj
deleted file mode 100644
index 4a15ff41e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Samples.Modules.Wizard.csproj
+++ /dev/null
@@ -1,102 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Wizard</RootNamespace>
-    <AssemblyName>Samples.Modules.Wizard</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="WizardModule.cs" />
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
deleted file mode 100644
index efb64af6f..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Wizard.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Wizard"
-                 Description="The Wizard will explain how to do something in a series of steps.">   
-    <sample:DemoView.Resources>
-        <xctk:Wizard x:Key="_wizard" FinishButtonClosesWindow="True" Help="OnWizardHelp">
-            <xctk:WizardPage x:Name="IntroPage" 
-                            Title="Welcome to my Wizard"
-                            Description="This Wizard will walk you though how to do something." />
-            <xctk:WizardPage x:Name="Page1" PageType="Interior"
-                            Title="Page 1"
-                            Description="This is the first page in the process." />
-            <xctk:WizardPage x:Name="Page2" PageType="Interior"
-                            Title="Page 2"
-                            Description="This is the second page in the process" />
-            <xctk:WizardPage x:Name="LastPage" PageType="Interior"
-                            Title="Last Page"
-                            Description="This is the last page in the process"
-                            CanFinish="True" />
-        </xctk:Wizard>
-    </sample:DemoView.Resources>
-
-    <Grid>
-        <Button Content="Start Wizard" Click="OnButtonClick" Width="150" Height="50"/>
-    </Grid>
-
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
deleted file mode 100644
index eefa7a72d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows;
-using System;
-
-namespace Samples.Modules.Wizard.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    private Window _window;
-
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void OnButtonClick( object sender, EventArgs e )
-    {
-      Xceed.Wpf.Toolkit.Wizard wizard = Resources[ "_wizard" ] as Xceed.Wpf.Toolkit.Wizard;
-      if( wizard != null )
-      {
-        wizard.CurrentPage = wizard.Items[ 0 ] as Xceed.Wpf.Toolkit.WizardPage;
-
-        if( _window != null )
-        {
-          _window.Content = null;
-          _window = null;
-        }
-        _window = new Window();
-        _window.Title = "Wizard demonstration";
-        _window.Content = wizard;
-        _window.Width = 600;
-        _window.Height = 400;
-        _window.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
-        // Window will be closed by Wizard because FinishButtonClosesWindow = true and CancelButtonClosesWindow = true
-        _window.ShowDialog();
-      }
-    }
-
-    private void OnWizardHelp( object sender, EventArgs e )
-    {
-      System.Windows.MessageBox.Show( "This is the Help for the Wizard\n\n\n\n\n", "Wizard Help" );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
deleted file mode 100644
index 482508e42..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Wizard.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Wizard.Views"
-              Header="Wizard" Tag="{x:Type views:HomeView}" >
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
deleted file mode 100644
index 997dab4f7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Wizard.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
deleted file mode 100644
index b60bfffec..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Wizard.Views;
-
-namespace Samples.Modules.Wizard
-{
-  public class WizardModule : ModuleBase
-  {
-    public WizardModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs
deleted file mode 100644
index 61d5d37a1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Zoombox Sample" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Zoombox Sample" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj
deleted file mode 100644
index 58d7702f0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Samples.Modules.Zoombox.csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{D6581837-4158-4165-BE2F-35EBF9742A54}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Modules.Zoombox</RootNamespace>
-    <AssemblyName>Samples.Modules.Zoombox</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism">
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <ProjectReference Include="..\..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ZoomboxModule.cs" />
-    <Compile Include="Views\HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Views\NavigationView.xaml.cs">
-      <DependentUpon>NavigationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Resources\Default.jpg" />
-    <Resource Include="Resources\ZoomboxProperties.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Views\HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Views\NavigationView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy "$(TargetDir)*.*" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\" /Y
-xcopy "$(ProjectDir)Views" "$(SolutionDir)Src\Samples\Samples\bin\$(ConfigurationName)\Samples\$(ProjectName)\" /s /Y /I
-</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml
deleted file mode 100644
index 88690f8cf..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml
+++ /dev/null
@@ -1,489 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Zoombox.Views.HomeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:local="clr-namespace:Samples.Modules.Zoombox.Views"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="Zoombox"
-                 Description="The Zoombox control provides zoom and pan functionality for any UIElement (its content) that has a discrete size. It allows the content to be scaled up (zoomed in) or scaled down (zoomed out) using the mouse wheel, key bindings, or programmatically through methods and properties exposed by the control. Similarly, the content can be panned (translated) in any direction by dragging it with the mouse, using key bindings, or programmatically through methods and properties exposed by the control.&#x0a;&#x0a;The Zoombox control also provides a view finder that acts as a reduced-scale map of the contained element, showing exactly which portion of the content is visible within the Zoombox's viewport.">
-
-   <Grid Grid.Row="1" 
-         HorizontalAlignment="Stretch"
-         VerticalAlignment="Stretch">
-      <Grid.ColumnDefinitions>
-         <ColumnDefinition Width="Auto" />
-         <ColumnDefinition Width="*" />
-      </Grid.ColumnDefinitions>
-
-      <TabControl Margin="20,20,0,20"
-                  Width="360"
-                  Grid.Column="0"
-                  Background="White"
-                  DataContext="{Binding ElementName=zoombox}">
-         <TabControl.Resources>
-            <xctk:RoundedValueConverter x:Key="Round"
-                                        Precision="2" />
-
-            <local:RectConverter x:Key="rectConverter" />
-            <local:PointConverter x:Key="pointConverter" />
-            <local:ViewNameConverter x:Key="viewNameConverter" />
-            <local:ViewFinderConverter x:Key="viewFinderConverter" />
-            <local:ViewStackCountConverter x:Key="viewStackCountConverter" />
-
-            <XmlDataProvider x:Key="Props"
-                             Source="pack://application:,,,/Samples.Modules.Zoombox;component/Resources/ZoomboxProperties.xml"
-                             XPath="Properties" />
-            <Style x:Key="PropertyList"
-                   TargetType="{x:Type ItemsControl}">
-               <Setter Property="IsTabStop"
-                       Value="False" />
-               <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type ItemsControl}">
-                        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
-                                      VerticalScrollBarVisibility="Auto">
-                           <StackPanel IsItemsHost="True" />
-                        </ScrollViewer>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-            </Style>
-
-            <Style x:Key="{x:Type ItemsControl}"
-                   TargetType="{x:Type ItemsControl}">
-               <Setter Property="IsTabStop"
-                       Value="False" />
-               <Setter Property="Template">
-                  <Setter.Value>
-                     <ControlTemplate TargetType="{x:Type ItemsControl}">
-                        <Grid MinHeight="45"
-                              x:Name="ItemGrid">
-                           <Popup AllowsTransparency="True"
-                                  Placement="Bottom"
-                                  PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
-                                  HorizontalOffset="75"
-                                  IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsMouseOver, Mode=OneWay}">
-                              <Border Name="Border"
-                                      Background="Black"
-                                      BorderBrush="White"
-                                      Margin="0"
-                                      BorderThickness="1"
-                                      CornerRadius="10">
-                                 <TextBlock Margin="7"
-                                            MaxWidth="500"
-                                            TextWrapping="Wrap"
-                                            Foreground="White"
-                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag.InnerText}" />
-                              </Border>
-                           </Popup>
-                           <Rectangle Grid.ColumnSpan="3"
-                                      Fill="White"
-                                      Stroke="{x:Null}"
-                                      StrokeThickness="0"
-                                      RadiusX="0"
-                                      RadiusY="0"
-                                      Margin="5,5,5,5" />
-                           <Grid IsItemsHost="True"
-                                 Margin="15,0">
-                              <Grid.ColumnDefinitions>
-                                 <ColumnDefinition Width="160" />
-                                 <ColumnDefinition Width="100" />
-                                 <ColumnDefinition Width="100" />
-                              </Grid.ColumnDefinitions>
-                           </Grid>
-                        </Grid>
-                     </ControlTemplate>
-                  </Setter.Value>
-               </Setter>
-            </Style>
-
-            <Style x:Key="{x:Type TextBlock}"
-                   BasedOn="{StaticResource {x:Type TextBlock}}"
-                   TargetType="{x:Type TextBlock}">
-               <Setter Property="HorizontalAlignment"
-                       Value="Left" />
-               <Setter Property="VerticalAlignment"
-                       Value="Center" />
-               <Setter Property="Height"
-                       Value="Auto" />
-            </Style>
-
-            <Style x:Key="{x:Type Slider}"
-                   BasedOn="{StaticResource {x:Type Slider}}"
-                   TargetType="{x:Type Slider}">
-               <Setter Property="HorizontalAlignment"
-                       Value="Stretch" />
-               <Setter Property="VerticalAlignment"
-                       Value="Center" />
-               <Setter Property="Height"
-                       Value="Auto" />
-               <Setter Property="Width"
-                       Value="Auto" />
-               <Setter Property="Margin"
-                       Value="5" />
-               <Setter Property="Grid.Column"
-                       Value="1" />
-            </Style>
-
-            <Style x:Key="{x:Type CheckBox}"
-                   BasedOn="{StaticResource {x:Type CheckBox}}"
-                   TargetType="{x:Type CheckBox}">
-               <Setter Property="HorizontalAlignment"
-                       Value="Center" />
-               <Setter Property="VerticalAlignment"
-                       Value="Center" />
-               <Setter Property="Margin"
-                       Value="5" />
-               <Setter Property="Grid.Column"
-                       Value="1" />
-            </Style>
-
-            <Style x:Key="{x:Type TextBox}"
-                   BasedOn="{StaticResource {x:Type TextBox}}"
-                   TargetType="{x:Type TextBox}">
-               <Setter Property="HorizontalAlignment"
-                       Value="Stretch" />
-               <Setter Property="VerticalAlignment"
-                       Value="Center" />
-               <Setter Property="Height"
-                       Value="Auto" />
-               <Setter Property="Margin"
-                       Value="5" />
-               <Setter Property="Grid.Column"
-                       Value="1" />
-            </Style>
-
-            <Style x:Key="{x:Type ComboBox}"
-                   BasedOn="{StaticResource {x:Type ComboBox}}"
-                   TargetType="{x:Type ComboBox}">
-               <Setter Property="HorizontalAlignment"
-                       Value="Stretch" />
-               <Setter Property="VerticalAlignment"
-                       Value="Center" />
-               <Setter Property="Height"
-                       Value="26" />
-               <Setter Property="Width"
-                       Value="Auto" />
-               <Setter Property="Margin"
-                       Value="10,5" />
-               <Setter Property="Grid.Column"
-                       Value="1" />
-               <Setter Property="SelectedValuePath"
-                       Value="Content" />
-            </Style>
-
-         </TabControl.Resources>
-
-         <TabItem Header="Animation">
-            <ItemsControl Style="{StaticResource PropertyList}">
-
-               <TextBlock Margin="5,10,5,5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="Animation Properties" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationAccelerationRatio}">
-                  <TextBlock Text="AnimationAccelerationRatio" />
-                  <Slider Name="AccelerationSlider"
-                          Maximum="1.0"
-                          Minimum="0.0"
-                          Value="{Binding AnimationAccelerationRatio}"
-                          ValueChanged="CoerceAnimationRatios" />
-                  <TextBlock Grid.Column="2"
-                             Width="50"
-                             Text="{Binding AnimationAccelerationRatio}"
-                             TextTrimming="CharacterEllipsis" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDecelerationRatio}">
-                  <TextBlock Text="AnimationDecelerationRatio" />
-                  <Slider Name="DecelerationSlider"
-                          Maximum="1.0"
-                          Minimum="0.0"
-                          Value="{Binding AnimationDecelerationRatio}"
-                          ValueChanged="CoerceAnimationRatios" />
-                  <TextBlock Grid.Column="2"
-                             Width="50"
-                             Text="{Binding AnimationDecelerationRatio}"
-                             TextTrimming="CharacterEllipsis" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDuration}">
-                  <TextBlock Text="AnimationDuration" />
-                  <Slider IsSnapToTickEnabled="True"
-                          TickFrequency="50"
-                          Minimum="0"
-                          Maximum="2000"
-                          Value="{Binding AnimationDuration.TimeSpan.TotalMilliseconds, Mode=OneWay}"
-                          ValueChanged="AdjustAnimationDuration" />
-                  <TextBlock Grid.Column="2"
-                             Text="{Binding AnimationDuration}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsAnimated}">
-                  <TextBlock Text="IsAnimated" />
-                  <CheckBox IsChecked="{Binding IsAnimated}" />
-               </ItemsControl>
-
-            </ItemsControl>
-         </TabItem>
-
-         <TabItem Header="Keyboard">
-            <ItemsControl Style="{StaticResource PropertyList}">
-
-               <TextBlock Margin="5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="KeyModifier Collections" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragModifiers}">
-                  <TextBlock Text="DragModifiers" />
-                  <TextBox Text="{Binding DragModifiers, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=RelativeZoomModifiers}">
-                  <TextBlock Text="RelativeZoomModifiers" />
-                  <TextBox Text="{Binding RelativeZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomModifiers}">
-                  <TextBlock Text="ZoomModifiers" />
-                  <TextBox Text="{Binding ZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomToSelectionModifiers}">
-                  <TextBlock Text="ZoomToSelectionModifiers" />
-                  <TextBox Text="{Binding ZoomToSelectionModifiers, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-
-               <TextBlock Margin="5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="Response to Preview Events" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragOnPreview}">
-                  <TextBlock Text="DragOnPreview" />
-                  <CheckBox IsChecked="{Binding DragOnPreview}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=NavigateOnPreview}">
-                  <TextBlock Text="NavigateOnPreview" />
-                  <CheckBox IsChecked="{Binding NavigateOnPreview}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOnPreview}">
-                  <TextBlock Text="ZoomOnPreview" />
-                  <CheckBox IsChecked="{Binding ZoomOnPreview}" />
-               </ItemsControl>
-
-               <TextBlock Margin="5,10,5,5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="Input States" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreDragModifiersActive}">
-                  <TextBlock Text="AreDragModifiersActive"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding AreDragModifiersActive, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreRelativeZoomModifiersActive}">
-                  <TextBlock Text="AreRelativeZoomModifiersActive"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding AreRelativeZoomModifiersActive, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomModifiersActive}">
-                  <TextBlock Text="AreZoomModifiersActive"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding AreZoomModifiersActive, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomToSelectionModifiersActive}">
-                  <TextBlock Text="AreZoomToSelectionModifiersActive"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding AreZoomToSelectionModifiersActive, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsDraggingContent}">
-                  <TextBlock Text="IsDraggingContent"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding IsDraggingContent, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsSelectingRegion}">
-                  <TextBlock Text="IsSelectingRegion"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding IsSelectingRegion, Mode=OneWay}" />
-               </ItemsControl>
-
-            </ItemsControl>
-         </TabItem>
-
-         <TabItem Header="Position &amp; Scale">
-            <ItemsControl Style="{StaticResource PropertyList}">
-
-               <TextBlock Margin="5,10,5,5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="Position Properties" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=PanDistance}">
-                  <TextBlock Text="PanDistance" />
-                  <TextBox Text="{Binding PanDistance, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Position}">
-                  <TextBlock Text="Position" />
-                  <TextBox IsEnabled="False" 
-                           Text="{Binding Position, Mode=OneWay, Converter={StaticResource pointConverter}}" />
-               </ItemsControl>
-
-               <TextBlock Margin="5,10,5,5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="Scale Properties" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AutoWrapContentWithViewbox}">
-                  <TextBlock Text="AutoWrapContentWithViewbox"
-                             Grid.ColumnSpan="2" />
-                  <CheckBox IsChecked="{Binding AutoWrapContentWithViewbox}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MaxScale}">
-                  <TextBlock Text="MaxScale" />
-                  <TextBox Text="{Binding MaxScale, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MinScale}">
-                  <TextBlock Text="MinScale" />
-                  <TextBox Text="{Binding MinScale, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Scale}">
-                  <TextBlock Text="Scale" />
-                  <TextBox Text="{Binding Scale, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOrigin}">
-                  <TextBlock Text="ZoomOrigin" />
-                  <TextBox Text="{Binding ZoomOrigin, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomPercentage}">
-                  <TextBlock Text="ZoomPercentage" />
-                  <TextBox Text="{Binding ZoomPercentage, UpdateSourceTrigger=PropertyChanged}" />
-               </ItemsControl>
-
-            </ItemsControl>
-         </TabItem>
-
-         <TabItem Header="View">
-            <ItemsControl Style="{StaticResource PropertyList}">
-
-               <TextBlock Margin="5,10,5,5"
-                          FontWeight="Bold"
-                          FontSize="12"
-                          Text="View Properties" />
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentView}">
-                  <TextBlock Text="CurrentView" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding CurrentView, Converter={StaticResource viewNameConverter}, Mode=OneWay}"
-                           Grid.ColumnSpan="2"
-                           Height="Auto"
-                           Width="155"
-                           Margin="5,10"
-                           HorizontalAlignment="Left"
-                           TextWrapping="WrapWithOverflow" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentViewIndex}">
-                  <TextBlock Text="CurrentViewIndex" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding CurrentViewIndex, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=EffectiveViewStackMode}">
-                  <TextBlock Text="EffectiveViewStackMode" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding EffectiveViewStackMode, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasBackStack}">
-                  <TextBlock Text="HasBackStack" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding HasBackStack, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasForwardStack}">
-                  <TextBlock Text="HasForwardStack" />
-                  <CheckBox IsEnabled="False"
-                            IsChecked="{Binding HasForwardStack, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinder}">
-                  <TextBlock Text="ViewFinder" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding ViewFinder, Converter={StaticResource viewFinderConverter}, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinderVisibility}">
-                  <TextBlock Text="ViewFinderVisibility" />
-                  <ComboBox  SelectedValue="{Binding ViewFinderVisibility}">
-                     <ComboBoxItem Content="{x:Static Visibility.Collapsed}" />
-                     <ComboBoxItem Content="{x:Static Visibility.Hidden}" />
-                     <ComboBoxItem Content="{x:Static Visibility.Visible}" />
-                  </ComboBox>
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Viewport}">
-                  <TextBlock Text="Viewport" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding Viewport, Converter={StaticResource rectConverter}, Mode=OneWay}"
-                           Grid.ColumnSpan="2"
-                           Width="155"
-                           Margin="5,10"
-                           HorizontalAlignment="Left" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStack}">
-                  <TextBlock Text="ViewStack" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding ViewStack, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackCount}">
-                  <TextBlock Text="ViewStackCount" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding ViewStackCount, Mode=OneWay}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackIndex}">
-                  <TextBlock Text="ViewStackIndex" />
-                  <Slider Minimum="0"
-                          Maximum="{Binding ViewStackCount, Converter={StaticResource viewStackCountConverter}}"
-                          Value="{Binding ViewStackIndex}" />
-                  <TextBlock Grid.Column="2"
-                             Width="50"
-                             Text="{Binding ViewStackIndex}" />
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackMode}">
-                  <TextBlock Text="ViewStackMode" />
-                  <ComboBox  SelectedValue="{Binding ViewStackMode}">
-                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Auto}" />
-                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Default}" />
-                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Disabled}" />
-                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Manual}" />
-                  </ComboBox>
-               </ItemsControl>
-               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackSource}">
-                  <TextBlock Text="ViewStackSource" />
-                  <TextBox IsEnabled="False"
-                           Text="{Binding ViewStackSource}" />
-               </ItemsControl>
-            </ItemsControl>
-         </TabItem>
-      </TabControl>
-      <xctk:Zoombox x:Name="zoombox"
-                    ViewStackIndex="0"
-                    Grid.Column="1"
-                    Margin="20"
-                    Focusable="True"
-                    IsTabStop="True">
-         <xctk:Zoombox.ViewStack>
-            <xctk:ZoomboxView>Fit</xctk:ZoomboxView>
-         </xctk:Zoombox.ViewStack>
-         <Image Source="pack://application:,,,/Samples.Modules.Zoombox;component/Resources/Default.jpg" />
-
-      </xctk:Zoombox>
-   </Grid>
-</sample:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs
deleted file mode 100644
index bd6b8f1a2..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/HomeView.xaml.cs
+++ /dev/null
@@ -1,129 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure.Controls;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System;
-using System.Windows;
-
-namespace Samples.Modules.Zoombox.Views
-{
-  /// <summary>
-  /// Interaction logic for HomeView.xaml
-  /// </summary>
-  [RegionMemberLifetime( KeepAlive = false )]
-  public partial class HomeView : DemoView
-  {
-    public HomeView()
-    {
-      InitializeComponent();
-    }
-
-    private void AdjustAnimationDuration( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      Slider slider = sender as Slider;
-      if( slider == null )
-        return;
-
-      zoombox.AnimationDuration = TimeSpan.FromMilliseconds( slider.Value );
-    }
-
-    private void CoerceAnimationRatios( object sender, RoutedPropertyChangedEventArgs<double> e )
-    {
-      Slider slider = sender as Slider;
-      if( slider == null )
-        return;
-
-      Slider otherRatio = ( sender == this.AccelerationSlider ) ? this.DecelerationSlider : this.AccelerationSlider;
-
-      if( slider.Value + otherRatio.Value > 1 )
-      {
-        otherRatio.Value = 1 - slider.Value;
-      }
-    }
-  }
-
-  public abstract class SimpleConverter : IValueConverter
-  {
-    protected abstract object Convert( object value );
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      return this.Convert( value );
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-
-  public class ViewNameConverter : SimpleConverter
-  {
-    protected override object Convert( object value )
-    {
-      return value.ToString().Remove( 0, 13 );
-    }
-  }
-
-
-  public class ViewFinderConverter : SimpleConverter
-  {
-    protected override object Convert( object value )
-    {
-      return ( value != null ) ? value.GetType().Name : null;
-    }
-  }
-
-  public class RectConverter : SimpleConverter
-  {
-    protected override object Convert( object value )
-    {
-      return string.Format( "({0}),({1})",
-        PointConverter.ConvertPoint( ( ( Rect )value ).TopLeft ),
-        PointConverter.ConvertPoint( ( ( Rect )value ).BottomRight ) );
-    }
-  }
-
-  public class PointConverter : SimpleConverter
-  {
-    protected override object Convert( object value )
-    {
-      return PointConverter.ConvertPoint( ( Point )value );
-    }
-
-    public static string ConvertPoint( Point point )
-    {
-      return string.Format( "{0},{1}",
-        Math.Round( point.X ), Math.Round( point.Y ) );
-    }
-  }
-
-  public class ViewStackCountConverter : SimpleConverter
-  {
-    protected override object Convert( object value )
-    {
-      return ( ( int )value ) - 1;
-    }
-  }  
-
-
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml
deleted file mode 100644
index 7b9b59551..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<TreeViewItem x:Class="Samples.Modules.Zoombox.Views.NavigationView"
-              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-              xmlns:views="clr-namespace:Samples.Modules.Zoombox.Views"
-              Header="Zoombox" Tag="{x:Type views:HomeView}" >
-
-   <TreeViewItem.Resources>
-      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-   </TreeViewItem.Resources>
-
-</TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs
deleted file mode 100644
index 81dd13cde..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Views/NavigationView.xaml.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows.Controls;
-
-namespace Samples.Modules.Zoombox.Views
-{
-  /// <summary>
-  /// Interaction logic for NavigationView.xaml
-  /// </summary>
-  public partial class NavigationView : TreeViewItem
-  {
-    public NavigationView()
-    {
-      InitializeComponent();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs
deleted file mode 100644
index 70c7343cf..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/ZoomboxModule.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
-using Samples.Modules.Zoombox.Views;
-
-namespace Samples.Modules.Zoombox
-{
-  public class ZoomboxModule : ModuleBase
-  {
-    public ZoomboxModule( IUnityContainer container, IRegionManager regionManager )
-      : base( container, regionManager )
-    {
-    }
-
-    protected override void InitializeModule()
-    {
-      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
-    }
-
-    protected override void RegisterViewsAndTypes()
-    {
-      Container.RegisterNavigationType( typeof( HomeView ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
deleted file mode 100644
index 30e88361b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using Microsoft.Practices.Prism.Commands;
-
-namespace Samples.Infrastructure.Commands
-{
-  public class TreeViewCommandBehavior : CommandBehaviorBase<TreeView>
-  {
-    public TreeViewCommandBehavior( TreeView treeView )
-      : base( treeView )
-    {
-      treeView.SelectedItemChanged += SelectedItemChanged;
-    }
-
-    void SelectedItemChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
-    {
-      //This treeview command is specfic to the navigation region, 
-      //so I always want to pass the tag of the selected treeviewitem
-      //because it will conatin the Type of view to navigate to.
-      var type = ( e.NewValue as FrameworkElement ).Tag as Type;
-      CommandParameter = type != null ? type.FullName : null;
-      ExecuteCommand();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
deleted file mode 100644
index 927af6efd..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace Samples.Infrastructure.Commands
-{
-  public class TreeViewSelected
-  {
-    private static readonly DependencyProperty SelectedCommandBehaviorProperty = DependencyProperty.RegisterAttached( "SelectedCommandBehavior", typeof( TreeViewCommandBehavior ), typeof( TreeViewSelected ), null );
-
-    public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached( "Command", typeof( ICommand ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandCallback ) );
-    public static void SetCommand( TreeView menuItem, ICommand command )
-    {
-      menuItem.SetValue( CommandProperty, command );
-    }
-    public static ICommand GetCommand( TreeView menuItem )
-    {
-      return menuItem.GetValue( CommandProperty ) as ICommand;
-    }
-
-    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached( "CommandParameter", typeof( object ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandParameterCallback ) );
-    public static void SetCommandParameter( TreeView menuItem, object parameter )
-    {
-      menuItem.SetValue( CommandParameterProperty, parameter );
-    }
-    public static object GetCommandParameter( TreeView menuItem )
-    {
-      return menuItem.GetValue( CommandParameterProperty );
-    }
-
-    private static void OnSetCommandCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
-    {
-      TreeView menuItem = dependencyObject as TreeView;
-      if( menuItem != null )
-      {
-        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
-        behavior.Command = e.NewValue as ICommand;
-      }
-    }
-
-    private static void OnSetCommandParameterCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
-    {
-      TreeView menuItem = dependencyObject as TreeView;
-      if( menuItem != null )
-      {
-        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
-        behavior.CommandParameter = e.NewValue;
-      }
-    }
-
-    private static TreeViewCommandBehavior GetOrCreateBehavior( TreeView menuItem )
-    {
-      TreeViewCommandBehavior behavior = menuItem.GetValue( SelectedCommandBehaviorProperty ) as TreeViewCommandBehavior;
-      if( behavior == null )
-      {
-        behavior = new TreeViewCommandBehavior( menuItem );
-        menuItem.SetValue( SelectedCommandBehaviorProperty, behavior );
-      }
-
-      return behavior;
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
deleted file mode 100644
index 2022fa5bf..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
+++ /dev/null
@@ -1,184 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Samples.Infrastructure.Controls
-{
-  public class DemoView : ContentControl
-  {
-    #region Members
-
-    readonly string _applicationPath = String.Empty;
-    const string _samplesFolderName = "Samples";
-
-    #endregion //Members
-
-    #region Properties
-
-
-
-    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( String.Empty ) );
-    public string Description
-    {
-      get
-      {
-        return ( string )GetValue( DescriptionProperty );
-      }
-      set
-      {
-        SetValue( DescriptionProperty, value );
-      }
-    }
-
-
-    public static readonly DependencyProperty CSharpTextProperty = DependencyProperty.Register( "CSharpText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
-    public string CSharpText
-    {
-      get
-      {
-        return ( string )GetValue( CSharpTextProperty );
-      }
-      set
-      {
-        SetValue( CSharpTextProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
-    public string Title
-    {
-      get
-      {
-        return ( string )GetValue( TitleProperty );
-      }
-      set
-      {
-        SetValue( TitleProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty XamlTextProperty = DependencyProperty.Register( "XamlText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
-    public string XamlText
-    {
-      get
-      {
-        return ( string )GetValue( XamlTextProperty );
-      }
-      set
-      {
-        SetValue( XamlTextProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty VerticalScrollBarVisibilityProperty = DependencyProperty.Register( "VerticalScrollBarVisibility", typeof( ScrollBarVisibility ), typeof( DemoView ), new UIPropertyMetadata( ScrollBarVisibility.Auto ) );
-    public ScrollBarVisibility VerticalScrollBarVisibility
-    {
-      get 
-      { 
-        return ( ScrollBarVisibility )GetValue( VerticalScrollBarVisibilityProperty ); 
-      }
-      set 
-      { 
-        SetValue( VerticalScrollBarVisibilityProperty, value ); 
-      }
-    }
-
-    #endregion //Properties
-
-    #region Constructors
-
-    static DemoView()
-    {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( DemoView ), new FrameworkPropertyMetadata( typeof( DemoView ) ) );
-    }
-
-    public DemoView()
-    {
-      _applicationPath = Path.GetDirectoryName( System.Reflection.Assembly.GetExecutingAssembly().Location );
-    }
-
-    #endregion //Constructors
-
-    #region Base Class Overrides
-
-    protected override void OnContentChanged( object oldContent, object newContent )
-    {
-      base.OnContentChanged( oldContent, newContent );
-      //the parent of the content will be the View
-      UpdateContentCode( ( newContent as FrameworkElement ).Parent );
-    }
-
-    #endregion //Base Class Overrides
-
-    #region Methods
-
-    private void UpdateContentCode( object newContent )
-    {
-      //get the type of the content loaded in the ContentRegion
-      var type = newContent.GetType();
-      //grab only the name of the content which will correspond to the name of the file to load
-      var viewName = type.FullName.Substring( type.FullName.LastIndexOf( "." ) + 1 );
-      //get the module name
-      var moduleName = type.Module.Name.Replace( ".dll", String.Empty );
-
-      SetText( viewName, moduleName );
-    }
-
-    private void SetText( string viewName, string moduleName )
-    {
-      SetCSharpText( viewName, moduleName );
-      SetXamlText( viewName, moduleName );
-    }
-
-    private void SetCSharpText( string viewName, string moduleName )
-    {
-      //now we need to append the file extension
-      string fileName = String.Format( "{0}.xaml", viewName );
-      string filePath = GetFilePath( moduleName, fileName );
-      XamlText = ReadFileText( filePath );
-    }
-
-    private void SetXamlText( string viewName, string moduleName )
-    {
-      //now we need to append the file extension
-      string fileName = String.Format( "{0}.xaml.cs", viewName );
-      string filePath = GetFilePath( moduleName, fileName );
-      CSharpText = ReadFileText( filePath );
-    }
-
-    private string GetFilePath( string moduleName, string fileName )
-    {
-      return Path.Combine( _applicationPath, _samplesFolderName, moduleName, fileName );
-    }
-
-    private static string ReadFileText( string filePath )
-    {
-      string text = String.Empty;
-      if( File.Exists( filePath ) )
-        text = File.ReadAllText( filePath );
-      return text;
-    }
-
-    #endregion //Methods
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
deleted file mode 100644
index b30d175da..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Samples.Infrastructure.Core.CodeFormatting;
-
-namespace Samples.Infrastructure.Converters
-{
-  public class CSharpColorConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value == null )
-        return value;
-
-      String val = ( String )value;
-
-      CSharpFormat cSharpFormat = new CSharpFormat();
-      FlowDocument doc = new FlowDocument();
-      Paragraph p = new Paragraph();
-      p = cSharpFormat.FormatCode( val );
-      doc.Blocks.Add( p );
-
-      RichTextBox rtb = new RichTextBox();
-      rtb.IsReadOnly = true;
-      rtb.Document = doc;
-      rtb.Document.PageWidth = 2500.0;
-      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
-      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-      rtb.FontFamily = new FontFamily( "Courier New" );
-      return rtb;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
deleted file mode 100644
index 9365b59d1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
+++ /dev/null
@@ -1,140 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Media;
-using Samples.Infrastructure.Core.CodeFormatting;
-
-namespace Samples.Infrastructure.Converters
-{
-  public class XamlColorConverter : IValueConverter
-  {
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      if( value == null )
-        return value;
-
-      string xaml = value as string;
-
-      FlowDocument doc = new FlowDocument();
-      ColorizeXAML( xaml, doc );
-
-      RichTextBox rtb = new RichTextBox();
-      rtb.IsReadOnly = true;
-      rtb.Document = doc;
-      rtb.Document.PageWidth = 2500.0;
-      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
-      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-      rtb.FontFamily = new FontFamily( "Courier New" );
-      return rtb;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #region SyntaxColoring
-
-    #region ColorizeXAML
-
-    public void ColorizeXAML( string xamlText, FlowDocument targetDoc )
-    {
-      XmlTokenizer tokenizer = new XmlTokenizer();
-      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-
-      List<XmlToken> tokens = tokenizer.Tokenize( xamlText, ref mode );
-      List<string> tokenTexts = new List<string>( tokens.Count );
-      List<Color> colors = new List<Color>( tokens.Count );
-      int position = 0;
-      foreach( XmlToken token in tokens )
-      {
-        string tokenText = xamlText.Substring( position, token.Length );
-        tokenTexts.Add( tokenText );
-        Color color = ColorForToken( token, tokenText );
-        colors.Add( color );
-        position += token.Length;
-      }
-
-      Paragraph p = new Paragraph();
-
-      // Loop through tokens
-      for( int i = 0; i < tokenTexts.Count; i++ )
-      {
-        Run r = new Run( tokenTexts[ i ] );
-        r.Foreground = new SolidColorBrush( colors[ i ] );
-        p.Inlines.Add( r );
-      }
-
-      targetDoc.Blocks.Add( p );
-    }
-
-    #endregion //ColorizeXAML
-
-    static Color ColorForToken( XmlToken token, string tokenText )
-    {
-      Color color = Color.FromRgb( 0, 0, 0 );
-      switch( token.Kind )
-      {
-        case XmlTokenKind.Open:
-        case XmlTokenKind.OpenClose:
-        case XmlTokenKind.Close:
-        case XmlTokenKind.SelfClose:
-        case XmlTokenKind.CommentBegin:
-        case XmlTokenKind.CommentEnd:
-        case XmlTokenKind.CDataBegin:
-        case XmlTokenKind.CDataEnd:
-        case XmlTokenKind.Equals:
-        case XmlTokenKind.OpenProcessingInstruction:
-        case XmlTokenKind.CloseProcessingInstruction:
-        case XmlTokenKind.AttributeValue:
-          color = Color.FromRgb( 0, 0, 255 );
-          // color = "blue";
-          break;
-        case XmlTokenKind.ElementName:
-          color = Color.FromRgb( 163, 21, 21 );
-          // color = "brown";
-          break;
-        case XmlTokenKind.TextContent:
-          // color = "black";
-          break;
-        case XmlTokenKind.AttributeName:
-        case XmlTokenKind.Entity:
-          color = Color.FromRgb( 255, 0, 0 );
-          // color = "red";
-          break;
-        case XmlTokenKind.CommentText:
-          color = Color.FromRgb( 0, 128, 0 );
-          // color = "green";
-          break;
-      }
-      if( token.Kind == XmlTokenKind.ElementWhitespace
-          || ( token.Kind == XmlTokenKind.TextContent && tokenText.Trim() == "" ) )
-      {
-        // color = null;
-      }
-      return color;
-    }
-    #endregion SyntaxColoring
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
deleted file mode 100644
index bed76b99d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using Microsoft.Practices.Unity;
-
-namespace Samples.Infrastructure.Extensions
-{
-  public static class UnityContainerExtensions
-  {
-    public static void RegisterNavigationType( this IUnityContainer container, Type type )
-    {
-      container.RegisterType( typeof( Object ), type, type.FullName );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
deleted file mode 100644
index e6413821a..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using Microsoft.Practices.Prism.Modularity;
-using Microsoft.Practices.Prism.Regions;
-using Microsoft.Practices.Unity;
-
-namespace Samples.Infrastructure
-{
-  public abstract class ModuleBase : IModule
-  {
-    protected IRegionManager RegionManager
-    {
-      get;
-      private set;
-    }
-    protected IUnityContainer Container
-    {
-      get;
-      private set;
-    }
-
-    protected ModuleBase( IUnityContainer container, IRegionManager regionManager )
-    {
-      Container = container;
-      RegionManager = regionManager;
-    }
-
-    public void Initialize()
-    {
-      //types must be registered first
-      RegisterViewsAndTypes();
-      //now initialize the module
-      InitializeModule();
-    }
-
-    protected abstract void InitializeModule();
-    protected abstract void RegisterViewsAndTypes();
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
deleted file mode 100644
index 05df1b54d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Samples" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Samples" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
deleted file mode 100644
index bbd08ec16..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-namespace Samples.Infrastructure
-{
-  public static class RegionNames
-  {
-    public static readonly string NavigationRegion = "NavigationRegion";
-    public static readonly string ContentRegion = "ContentRegion";
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj
deleted file mode 100644
index 843f384c9..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Samples.Infrastructure.csproj
+++ /dev/null
@@ -1,90 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</ProjectGuid>
-    <OutputType>library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples.Infrastructure</RootNamespace>
-    <AssemblyName>Samples.Infrastructure</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Commands\TreeViewCommandBehavior.cs" />
-    <Compile Include="Commands\TreeViewSelected.cs" />
-    <Compile Include="Controls\DemoView.cs" />
-    <Compile Include="Converters\CSharpColorConverter.cs" />
-    <Compile Include="Converters\XamlColorConverter.cs" />
-    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
-    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
-    <Compile Include="Extensions\UnityContainerExtensions.cs" />
-    <Compile Include="ModuleBase.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="RegionNames.cs" />
-    <Compile Include="ViewModelBase.cs" />
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
deleted file mode 100644
index 0493fffa0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
+++ /dev/null
@@ -1,186 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="clr-namespace:Samples.Infrastructure.Controls"
-    xmlns:infConverters="clr-namespace:Samples.Infrastructure.Converters">
-
-   <infConverters:XamlColorConverter x:Key="XamlColorConverter" />
-   <infConverters:CSharpColorConverter x:Key="CSharpColorConverter" />
-
-   <LinearGradientBrush x:Key="TabBackgroundDefault" EndPoint="0.330810546875,1" StartPoint="0.330810546875,0">
-      <GradientStop Color="#FF100311" Offset="1"/>
-      <GradientStop Color="#FF666666" Offset="0"/>
-   </LinearGradientBrush>
-
-   <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabItem}">
-               <Grid Width="Auto" Height="29" Margin="0">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="0.565*" />
-                     <RowDefinition Height="0.435*" />
-                  </Grid.RowDefinitions>
-                  <Border Grid.RowSpan="2" CornerRadius="0" Margin="0,0,0,1" Opacity="1" SnapsToDevicePixels="True">
-                     <Border.Background>
-                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                           <GradientStop Color="#FF333333" Offset="0" />
-                           <GradientStop Color="#FF9F9F9F" Offset="1" />
-                        </LinearGradientBrush>
-                     </Border.Background>
-                  </Border>
-                  <Border Background="{StaticResource TabBackgroundDefault}" CornerRadius="0" Margin="1,0,0,1" Grid.RowSpan="2" x:Name="border" SnapsToDevicePixels="True" />
-                  <TextBlock HorizontalAlignment="Center" Margin="15,0,15,0" VerticalAlignment="Center" Grid.RowSpan="2" FontFamily="Segoe UI" FontSize="11" FontWeight="Bold" Foreground="#4CFFFFFF" Text="{TemplateBinding Header}" TextWrapping="Wrap" x:Name="textBlock" />
-                  <Rectangle x:Name="rectangle" Grid.RowSpan="2" Height="1" VerticalAlignment="Top" Margin="1,1,0,0" Visibility="Collapsed" SnapsToDevicePixels="True">
-                     <Rectangle.Fill>
-                        <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
-                           <GradientStop Color="#FFF8EDED" Offset="0.504" />
-                           <GradientStop Color="#00111010" Offset="1" />
-                           <GradientStop Color="#00000000" />
-                        </LinearGradientBrush>
-                     </Rectangle.Fill>
-                  </Rectangle>
-                  <Rectangle Grid.RowSpan="2" Width="1" HorizontalAlignment="Right" Margin="0,0,-1,1" SnapsToDevicePixels="True">
-                     <Rectangle.Fill>
-                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                           <GradientStop Color="#FF2B2B2B" Offset="0" />
-                           <GradientStop Color="#99FFFFFF" Offset="1" />
-                        </LinearGradientBrush>
-                     </Rectangle.Fill>
-                  </Rectangle>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsMouseOver" Value="True">
-                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFF2EDF4" />
-                  </Trigger>
-                  <Trigger Property="IsSelected" Value="True">
-                     <Setter Property="Panel.ZIndex" Value="100" />
-                     <Setter Property="Background" TargetName="border">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="-0.003,1.107" StartPoint="0,0">
-                              <GradientStop Color="#FF9305CF" Offset="0" />
-                              <GradientStop Color="Black" Offset="1" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFFFFFFF" />
-                     <Setter Property="Visibility" TargetName="rectangle" Value="Visible" />
-                     <Setter Property="Fill" TargetName="rectangle">
-                        <Setter.Value>
-                           <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
-                              <GradientStop Color="#FFF8EDED" Offset="0.504" />
-                              <GradientStop Color="#00BD2FD5" Offset="1" />
-                              <GradientStop Color="#00BD2FD5" />
-                           </LinearGradientBrush>
-                        </Setter.Value>
-                     </Setter>
-                     <Setter Property="Margin" TargetName="border" Value="1,0,0,0" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Margin" Value="0,0,1,0" />
-   </Style>
-
-   <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TabControl}">
-               <Grid KeyboardNavigation.TabNavigation="Local">
-                  <Grid.RowDefinitions>
-                     <RowDefinition Height="Auto" />
-                     <RowDefinition Height="*" />
-                  </Grid.RowDefinitions>
-                  <TabPanel Grid.Row="0" Margin="0,0,7,-1" x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" HorizontalAlignment="Right" />
-                  <Border Grid.Row="1" x:Name="Border" Background="White" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="2" SnapsToDevicePixels="True">
-                     <ContentPresenter Margin="4" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
-                  </Border>
-                  <Rectangle HorizontalAlignment="Stretch" Margin="1,1,1,0" VerticalAlignment="Top" Width="Auto" Height="8" Grid.Row="1" SnapsToDevicePixels="True">
-                     <Rectangle.Fill>
-                        <LinearGradientBrush EndPoint="0.5,0.861" StartPoint="0.5,0">
-                           <GradientStop Color="#FF13011B" Offset="0.014" />
-                           <GradientStop Color="#FF8D05C7" Offset="0.97" />
-                        </LinearGradientBrush>
-                     </Rectangle.Fill>
-                  </Rectangle>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style TargetType="{x:Type local:DemoView}">
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:DemoView}">
-               <Border Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}">
-                  <Grid>
-                     <TabControl TabStripPlacement="Top" Style="{StaticResource TabControlStyle}" >
-                        <TabItem Header="Sample" Style="{StaticResource TabItemStyle}">
-                           <ScrollViewer VerticalScrollBarVisibility="{TemplateBinding VerticalScrollBarVisibility}">
-                              <Grid>
-                                 <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto"/>
-                                    <RowDefinition Height="*"/>
-                                 </Grid.RowDefinitions>
-                                 <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="10,10,10,0" Text="{TemplateBinding Description}"/>
-                                 <ContentPresenter Grid.Row="1"  Margin="10" ScrollViewer.CanContentScroll="True" />
-                              </Grid>
-                           </ScrollViewer>
-                        </TabItem>
-                        <TabItem Header="XAML" Style="{StaticResource TabItemStyle}">
-                           <ContentPresenter x:Name="_xamlCode" 
-                                             Content="{Binding XamlText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource XamlColorConverter}}"
-                                             HorizontalAlignment="Stretch"
-                                             VerticalAlignment="Stretch"
-                                             ScrollViewer.CanContentScroll="True" 
-                                             Margin="5,10,5,5" />
-                        </TabItem>
-                        <TabItem Header="Code" Style="{StaticResource TabItemStyle}">
-                           <ContentPresenter x:Name="_cSharpCode" 
-                                             Content="{Binding CSharpText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CSharpColorConverter}}"
-                                             HorizontalAlignment="Stretch"
-                                             VerticalAlignment="Stretch"
-                                             ScrollViewer.CanContentScroll="True"
-                                             Margin="5,10,5,5" />
-                        </TabItem>
-                     </TabControl>
-                     <TextBlock Opacity="1" 
-                                HorizontalAlignment="Left" 
-                                Margin="12,5,0,0" 
-                                VerticalAlignment="Top"
-                                TextWrapping="Wrap" 
-                                FontSize="18" 
-                                FontFamily="Segoe UI" 
-                                TextAlignment="right" 
-                                Foreground="#FFFFFFFF" 
-                                FontWeight="Bold" 
-                                Text="{TemplateBinding Title}" />
-                  </Grid>
-               </Border>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
deleted file mode 100644
index 11ec9b42b..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.ComponentModel;
-
-namespace Samples.Infrastructure
-{
-  public interface IViewModel
-  {
-  }
-
-  public class ViewModelBase : IViewModel, INotifyPropertyChanged
-  {
-    public event PropertyChangedEventHandler PropertyChanged;
-    protected virtual void OnPropertyChanged( string propertyName )
-    {
-      if( PropertyChanged != null )
-        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
deleted file mode 100644
index fce62aad1..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.config
+++ /dev/null
@@ -1,28 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-   <configSections>
-      <section name="modules" type="Microsoft.Practices.Prism.Modularity.ModulesConfigurationSection, Microsoft.Practices.Prism"/>
-   </configSections>
-
-   <modules>
-      <module assemblyFile="Samples.Modules.BusyIndicator.dll" moduleType="Samples.Modules.BusyIndicator.BusyIndicatorModule, Samples.Modules.BusyIndicator" moduleName="BusyIndicatorModule" />
-      <module assemblyFile="Samples.Modules.Button.dll" moduleType="Samples.Modules.Button.ButtonModule, Samples.Modules.Button" moduleName="ButtonModule" />
-      <module assemblyFile="Samples.Modules.Calculator.dll" moduleType="Samples.Modules.Calculator.CalculatorModule, Samples.Modules.Calculator" moduleName="CalculatorModule" />
-      <module assemblyFile="Samples.Modules.CheckLists.dll" moduleType="Samples.Modules.CheckLists.CheckListsModule, Samples.Modules.CheckLists" moduleName="CheckListsModule" />
-      <module assemblyFile="Samples.Modules.ChildWindow.dll" moduleType="Samples.Modules.ChildWindow.ChildWindowModule, Samples.Modules.ChildWindow" moduleName="ChildWindowModule" />
-      <module assemblyFile="Samples.Modules.DataGrid.dll" moduleType="Samples.Modules.DataGrid.DataGridModule, Samples.Modules.DataGrid" moduleName="DataGridModule" />
-      <module assemblyFile="Samples.Modules.Color.dll" moduleType="Samples.Modules.Color.ColorModule, Samples.Modules.Color" moduleName="ColorModule" />
-      <module assemblyFile="Samples.Modules.DateTime.dll" moduleType="Samples.Modules.DateTime.DateTimeModule, Samples.Modules.DateTime" moduleName="DateTimeModule" />
-      <module assemblyFile="Samples.Modules.Magnifier.dll" moduleType="Samples.Modules.Magnifier.MagnifierModule, Samples.Modules.Magnifier" moduleName="MagnifierModule" />
-      <module assemblyFile="Samples.Modules.Numeric.dll" moduleType="Samples.Modules.Numeric.NumericModule, Samples.Modules.Numeric" moduleName="NumericModule" />
-      <module assemblyFile="Samples.Modules.MessageBox.dll" moduleType="Samples.Modules.MessageBox.MessageBoxModule, Samples.Modules.MessageBox" moduleName="MessageBoxModule" />
-      <module assemblyFile="Samples.Modules.Pie.dll" moduleType="Samples.Modules.Pie.PieModule, Samples.Modules.Pie" moduleName="PieModule" />
-      <module assemblyFile="Samples.Modules.PropertyGrid.dll" moduleType="Samples.Modules.PropertyGrid.PropertyGridModule, Samples.Modules.PropertyGrid" moduleName="PropertyGridModule" />
-      <module assemblyFile="Samples.Modules.Panels.dll" moduleType="Samples.Modules.Panels.PanelsModule, Samples.Modules.Panels" moduleName="PanelsModule" />
-      <module assemblyFile="Samples.Modules.Text.dll" moduleType="Samples.Modules.Text.TextModule, Samples.Modules.Text" moduleName="TextModule" />
-      <module assemblyFile="Samples.Modules.TimelinePanel.dll" moduleType="Samples.Modules.TimelinePanel.TimelinePanelModule, Samples.Modules.TimelinePanel" moduleName="TimelinePanelModule" />
-      <module assemblyFile="Samples.Modules.Wizard.dll" moduleType="Samples.Modules.Wizard.WizardModule, Samples.Modules.Wizard" moduleName="WizardModule" />
-      <module assemblyFile="Samples.Modules.Zoombox.dll" moduleType="Samples.Modules.Zoombox.ZoomboxModule, Samples.Modules.Zoombox" moduleName="ZoomboxModule" />
-      <module assemblyFile="Samples.Modules.Themes.dll" moduleType="Samples.Modules.Themes.ThemesModule, Samples.Modules.Themes" moduleName="ThemesModule" />
-   </modules>
-</configuration>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
deleted file mode 100644
index 4b472be03..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
+++ /dev/null
@@ -1,32 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<Application x:Class="Samples.App"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <Application.Resources>
-
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Resources/TextBlockStyles.xaml" />
-            <ResourceDictionary Source="/Resources/TreeViewStyles.xaml" />
-         </ResourceDictionary.MergedDictionaries>
-      </ResourceDictionary>
-
-   </Application.Resources>
-</Application>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
deleted file mode 100644
index 149d71cb4..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows;
-
-namespace Samples
-{
-  /// <summary>
-  /// Interaction logic for App.xaml
-  /// </summary>
-  public partial class App : Application
-  {
-    protected override void OnStartup( StartupEventArgs e )
-    {
-      // Put the following code before InitializeComponent()
-      // Sets the culture to French (France)
-      //Thread.CurrentThread.CurrentCulture = new CultureInfo("da-DK");
-      // Sets the UI culture to French (France)
-      //Thread.CurrentThread.CurrentUICulture = new CultureInfo("da-DK");
-
-      base.OnStartup( e );
-      Bootstrapper bootstrapper = new Bootstrapper();
-      bootstrapper.Run();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
deleted file mode 100644
index d53942766..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
+++ /dev/null
@@ -1,48 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Windows;
-using Microsoft.Practices.Prism.Modularity;
-using Microsoft.Practices.Prism.UnityExtensions;
-using Microsoft.Practices.Unity;
-
-namespace Samples
-{
-  public class Bootstrapper : UnityBootstrapper
-  {
-    protected override DependencyObject CreateShell()
-    {
-      Container.RegisterType<IShellViewModel, ShellViewModel>();
-      return Container.Resolve<Shell>();
-    }
-
-    protected override void InitializeShell()
-    {
-      base.InitializeShell();
-
-      App.Current.MainWindow = ( Shell )Shell;
-      App.Current.MainWindow.Show();
-    }
-
-    protected override Microsoft.Practices.Prism.Modularity.IModuleCatalog CreateModuleCatalog()
-    {
-      return new ConfigurationModuleCatalog();
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
deleted file mode 100644
index b931c87e6..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-namespace Samples
-{
-  public interface IShellViewModel
-  {
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png
deleted file mode 100644
index ea52078d6..000000000
Binary files a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Images/Background.png and /dev/null differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
deleted file mode 100644
index 05df1b54d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Extended WPF Toolkit Samples" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyConfiguration( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Extended WPF Toolkit Samples" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
-[assembly: AssemblyTrademark( "" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[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)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "1.0.0.0" )]
-[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
deleted file mode 100644
index a418e505c..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
+++ /dev/null
@@ -1,38 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-   <Style x:Key="Header" TargetType="TextBlock">
-      <Setter Property="FontSize" Value="18" />
-      <Setter Property="FontWeight" Value="Bold" />
-      <Setter Property="Foreground" Value="#FF8605BD" />
-      <Setter Property="Margin" Value="0,5" />
-   </Style>
-
-   <Style x:Key="plusSuffix" TargetType="TextBlock">
-      <Setter Property="Margin" Value="5,0,0,0"/>
-      <Setter Property="Text" Value="Plus Only"/>
-      <Setter Property="FontStyle" Value="Italic"/>
-      <Setter Property="FontSize" Value="8"/>
-      <Setter Property="BaselineOffset" Value="7"/>
-      <Setter Property="Foreground" Value="Orange"/>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
deleted file mode 100644
index a507da3e7..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
+++ /dev/null
@@ -1,276 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-   <ResourceDictionary.MergedDictionaries>
-      <ResourceDictionary Source="TextBlockStyles.xaml"/>
-   </ResourceDictionary.MergedDictionaries>
-
-      <SolidColorBrush x:Key="HighlightFill" Color="#59FFFFFF" />
-   <LinearGradientBrush x:Key="SelectedFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#59FFFFFF" Offset="0" />
-      <GradientStop Color="#33FFFFFF" Offset="1" />
-      <GradientStop Color="#19FFFFFF" Offset="0.5" />
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="ForegroundHighlightFill" Color="#FFFFFFFF" />
-   <SolidColorBrush x:Key="ForegroundFill" Color="#FFFFFFFF" />
-   <LinearGradientBrush x:Key="GlyphFill" EndPoint="0,1" StartPoint="0,0">
-      <GradientStop Color="#FFFFFFFF" Offset="0" />
-      <GradientStop Color="#FF959595" Offset="1" />
-   </LinearGradientBrush>
-   <SolidColorBrush x:Key="ControlFill" Color="#00FFFFFF" />
-   <SolidColorBrush x:Key="CommonFill" Color="#00FFFFFF" />
-
-   <Style x:Key="TreeViewItemToggleButton" TargetType="{x:Type ToggleButton}">
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type ToggleButton}">
-               <ControlTemplate.Resources>
-                  <Storyboard x:Key="ExpandIndicatorIsChecked">
-                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
-                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="90" />
-                     </DoubleAnimationUsingKeyFrames>
-                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="0,1,0,0" />
-                     </ThicknessAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <Storyboard x:Key="ExpandIndicatorIsCheckedFalse">
-                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
-                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="90" />
-                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0" />
-                     </DoubleAnimationUsingKeyFrames>
-                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="1,0,0,0" />
-                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="2,0,0,0" />
-                     </ThicknessAnimationUsingKeyFrames>
-                     <BooleanAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.SnapsToDevicePixels)">
-                        <DiscreteBooleanKeyFrame KeyTime="00:00:00.2000000" Value="True" />
-                     </BooleanAnimationUsingKeyFrames>
-                  </Storyboard>
-               </ControlTemplate.Resources>
-               <Grid Width="15" Height="13" Background="Transparent" x:Name="grid">
-                  <Ellipse Width="12" Height="12" Fill="{TemplateBinding Background}" Stroke="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
-                  <Path HorizontalAlignment="Center" VerticalAlignment="Center" Height="6" Width="6" Stretch="Fill" Opacity="1" 
-                        Data="M303,349 C303,349 303,345 303,345 303,345 309.04167,347 309.04167,347 309.04167,347 303,349 303,349 z" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" x:Name="path" RenderTransformOrigin="0.5,0.5">
-                     <Path.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform ScaleX="1" ScaleY="1" />
-                           <SkewTransform AngleX="0" AngleY="0" />
-                           <RotateTransform Angle="0" />
-                           <TranslateTransform X="0" Y="0" />
-                        </TransformGroup>
-                     </Path.RenderTransform>
-                  </Path>
-               </Grid>
-               <ControlTemplate.Triggers>
-                  <Trigger Property="IsChecked" Value="True">
-                     <Trigger.ExitActions>
-                        <BeginStoryboard x:Name="ExpandIndicatorIsCheckedFalse_BeginStoryboard1" Storyboard="{StaticResource ExpandIndicatorIsCheckedFalse}" />
-                     </Trigger.ExitActions>
-                     <Trigger.EnterActions>
-                        <BeginStoryboard Storyboard="{StaticResource ExpandIndicatorIsChecked}" x:Name="ExpandIndicatorIsChecked_BeginStoryboard" />
-                     </Trigger.EnterActions>
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Foreground" Value="{StaticResource GlyphFill}" />
-      <Setter Property="Background" Value="{StaticResource ControlFill}" />
-   </Style>
-
-   <Style TargetType="{x:Type TreeViewItem}">
-      <Setter Property="Background" Value="{StaticResource CommonFill}" />
-      <Setter Property="Padding" Value="1,0,0,0" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type TreeViewItem}">
-               <ControlTemplate.Resources>
-                  <Storyboard x:Key="TreeItemIsExpanded">
-                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Opacity)">
-                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1" />
-                     </DoubleAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <Storyboard x:Key="MouseOver">
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <Storyboard x:Key="MouseOut">
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <Storyboard x:Key="ItemSelected">
-                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Offset)">
-                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0.5" />
-                     </DoubleAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#59FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#0CFFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#33FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                  </Storyboard>
-                  <Storyboard x:Key="ItemDeselected">
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
-                     </ColorAnimationUsingKeyFrames>
-                  </Storyboard>
-               </ControlTemplate.Resources>
-               <DockPanel SnapsToDevicePixels="True">
-                  <Grid x:Name="HeaderContainer" Background="Transparent" DockPanel.Dock="Top">
-                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition Width="*" />
-                     </Grid.ColumnDefinitions>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                     </Grid.RowDefinitions>
-                     <Border Grid.Column="0" x:Name="Selection_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="1" Opacity="1">
-                        <Border.Background>
-                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                              <GradientStop Color="#00FFFFFF" Offset="0" />
-                              <GradientStop Color="#00FFFFFF" Offset="1" />
-                              <GradientStop Color="#00FFFFFF" Offset="0.5" />
-                           </LinearGradientBrush>
-                        </Border.Background>
-                     </Border>
-                     <Rectangle Stroke="{x:Null}" HorizontalAlignment="Stretch" Width="Auto" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2" x:Name="SelectedRect">
-                        <Rectangle.Fill>
-                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                              <GradientStop Color="#00FFFFFF" Offset="0" />
-                              <GradientStop Color="#00FFFFFF" Offset="1 "/>
-                              <GradientStop Color="#00FFFFFF" Offset="0.533" />
-                           </LinearGradientBrush>
-                        </Rectangle.Fill>
-                     </Rectangle>
-                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" Width="Auto" VerticalAlignment="Center" Grid.ColumnSpan="1" Grid.Column="1" Margin="3,0,0,0" />
-                     <ToggleButton x:Name="Expander"  Style="{StaticResource TreeViewItemToggleButton}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" VerticalAlignment="Center" Margin="0,3,0,3" />
-                  </Grid>
-                  <ItemsPresenter x:Name="ItemsHost" HorizontalAlignment="Stretch" Height="Auto" Opacity="0" Margin="14,1,0,0" />
-               </DockPanel>
-               <ControlTemplate.Triggers>
-
-                  <DataTrigger Binding="{Binding Path=Parent.Parent, RelativeSource={RelativeSource TemplatedParent}}" Value="{x:Null}">
-                     <Setter TargetName="ItemsHost" Property="Margin" Value="15,1,0,0" />
-                  </DataTrigger>
-
-                  <Trigger SourceName="HeaderContainer" Property="IsMouseOver" Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard Storyboard="{StaticResource MouseOver}" x:Name="MouseOver_BeginStoryboard_HitTestArea" />
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <BeginStoryboard Storyboard="{StaticResource MouseOut}" x:Name="MouseOut_BeginStoryboard_HitTestArea" />
-                     </Trigger.ExitActions>
-                  </Trigger>
-
-
-                  <Trigger Property="IsExpanded" Value="false">
-                     <Setter Property="Visibility" Value="Collapsed" TargetName="ItemsHost" />
-                  </Trigger>
-                  <Trigger Property="IsExpanded" Value="True">
-                     <Trigger.EnterActions>
-                        <BeginStoryboard Storyboard="{StaticResource TreeItemIsExpanded}" x:Name="TreeItemIsExpanded_BeginStoryboard" />
-                     </Trigger.EnterActions>
-                     <Trigger.ExitActions>
-                        <StopStoryboard BeginStoryboardName="TreeItemIsExpanded_BeginStoryboard" />
-                     </Trigger.ExitActions>
-                     <Setter Property="Margin" Value="0,0,0,0" />
-                     <Setter Property="Grid.RowSpan" TargetName="Selection_Border" Value="1" />
-                  </Trigger>
-                  <Trigger Property="HasItems" Value="false">
-                     <Setter Property="Visibility" Value="Hidden" TargetName="Expander" />
-                  </Trigger>
-                  <Trigger Property="IsSelected" Value="true">
-                     <Trigger.ExitActions>
-                        <BeginStoryboard x:Name="ItemDeselected_BeginStoryboard1" Storyboard="{StaticResource ItemDeselected}" />
-                     </Trigger.ExitActions>
-                     <Trigger.EnterActions>
-                        <BeginStoryboard Storyboard="{StaticResource ItemSelected}" x:Name="ItemSelected_BeginStoryboard" />
-                     </Trigger.EnterActions>
-                  </Trigger>
-                  <MultiTrigger>
-                     <MultiTrigger.Conditions>
-                        <Condition Property="IsSelected" Value="true" />
-                        <Condition Property="IsSelectionActive" Value="false" />
-                     </MultiTrigger.Conditions>
-                     <Setter Property="Background" Value="{StaticResource SelectedFill}" />
-                     <Setter Property="Foreground" Value="{StaticResource ForegroundHighlightFill}" />
-                  </MultiTrigger>
-                  <Trigger Property="IsEnabled" Value="false">
-                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                  </Trigger>
-               </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-      <Setter Property="Margin" Value="0,0,0,1" />
-      <Setter Property="Foreground" Value="{StaticResource ForegroundFill}" />
-   </Style>
-
-   <Style x:Key="newFeature" TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource {x:Type TreeViewItem}}" >
-      <Setter Property="HeaderTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding}" />
-                  <TextBlock Margin="5,0,0,0" Text="New" FontStyle="Italic" FontSize="8" BaselineOffset="7" Foreground="Red" />
-               </StackPanel>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-   <Style x:Key="plusStyle" TargetType="{x:Type TreeViewItem}" BasedOn="{StaticResource {x:Type TreeViewItem}}" >
-      <Setter Property="HeaderTemplate">
-         <Setter.Value>
-            <DataTemplate>
-               <StackPanel Orientation="Horizontal">
-                  <TextBlock Text="{Binding}" />
-                  <TextBlock Style="{StaticResource plusSuffix}" />
-               </StackPanel>
-            </DataTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
-
-</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
deleted file mode 100644
index 348d93e85..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Samples.csproj
+++ /dev/null
@@ -1,124 +0,0 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Samples</RootNamespace>
-    <AssemblyName>Samples</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Practices.Prism, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Prism.UnityExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Prism.UnityExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity, Version=2.0.414.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\Libs\Prism\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Bootstrapper.cs" />
-    <Compile Include="IShellViewModel.cs" />
-    <Compile Include="Shell.xaml.cs">
-      <DependentUpon>Shell.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="ShellViewModel.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <None Include="App.config" />
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Samples.Infrastructure\Samples.Infrastructure.csproj">
-      <Project>{A4A049A4-665A-4651-9046-7D06E9D0CCDC}</Project>
-      <Name>Samples.Infrastructure</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Page Include="Resources\TextBlockStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\TreeViewStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Shell.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Resource Include="Images\Background.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
deleted file mode 100644
index 85c987d72..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
+++ /dev/null
@@ -1,65 +0,0 @@
-﻿<!--*********************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  ********************************************************************-->
-<Window x:Class="Samples.Shell" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:inf="clr-namespace:Samples.Infrastructure;assembly=Samples.Infrastructure"
-        xmlns:infCommands="clr-namespace:Samples.Infrastructure.Commands;assembly=Samples.Infrastructure"
-        xmlns:prism="http://www.codeplex.com/CompositeWPF"
-        Background="Black"
-        Title="Extended WPF Toolkit - Samples" Height="768" Width="1050" >
-   <Grid>
-      <Image Source="/Images/Background.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.RowSpan="2" />
-      <Grid Margin="15" >
-         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition />
-         </Grid.RowDefinitions>
-
-         <Grid Margin="10,0,10,10">
-            <TextBlock Text="Extended WPF Toolkit" Foreground="White" FontSize="28" FontWeight="Bold" />
-         </Grid>
-
-         <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <Border CornerRadius="5" BorderBrush="#FF666666" BorderThickness="1">
-               <TreeView prism:RegionManager.RegionName="{x:Static inf:RegionNames.NavigationRegion}" 
-                         infCommands:TreeViewSelected.Command="{Binding NavigateCommand}" 
-                         BorderBrush="{x:Null}" MinWidth="225" Margin="3"
-                         Loaded="TreeView_Loaded">
-                  <TreeView.Background>
-                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                        <GradientStop Color="#A1000000" Offset="0" />
-                        <GradientStop Color="Black" Offset="1" />
-                     </LinearGradientBrush>
-                  </TreeView.Background>
-               </TreeView>
-            </Border>
-
-            <Border Grid.Column="1" Margin="10,0,10,0" BorderBrush="Gray" BorderThickness="1" Background="#2C2E3E" CornerRadius="3">
-               <ContentControl x:Name="MainContent" prism:RegionManager.RegionName="{x:Static inf:RegionNames.ContentRegion}" Margin="5,0,5,8" />
-            </Border>
-
-         </Grid>
-      </Grid>
-   </Grid>
-</Window>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
deleted file mode 100644
index c48add0f0..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace Samples
-{
-  public partial class Shell : Window
-  {
-    public Shell( IShellViewModel viewModel )
-    {
-      InitializeComponent();
-      ViewModel = viewModel;
-    }
-
-    public IShellViewModel ViewModel
-    {
-      get
-      {
-        return ( IShellViewModel )DataContext;
-      }
-      private set
-      {
-        DataContext = value;
-      }
-    }
-
-    private void TreeView_Loaded( object sender, RoutedEventArgs e )
-    {
-      TreeView tv = ( TreeView )sender;
-      tv.Items.SortDescriptions.Add( new SortDescription( "Header", ListSortDirection.Ascending ) );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
deleted file mode 100644
index 8d1d8f91d..000000000
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
-
-   Visit http://xceed.com and follow @datagrid on Twitter.
-
-  **********************************************************************/
-
-using System;
-using System.Windows.Input;
-using Microsoft.Practices.Prism.Commands;
-using Microsoft.Practices.Prism.Regions;
-using Samples.Infrastructure;
-
-namespace Samples
-{
-  public class ShellViewModel : ViewModelBase, IShellViewModel
-  {
-    private readonly IRegionManager _regionManager;
-
-    public ICommand NavigateCommand
-    {
-      get;
-      set;
-    }
-
-    public ShellViewModel( IRegionManager regionManager )
-    {
-      _regionManager = regionManager;
-      NavigateCommand = new DelegateCommand<string>( Navigate );
-    }
-
-    private void Navigate( string navigatePath )
-    {
-      if( !String.IsNullOrWhiteSpace( navigatePath ) )
-        _regionManager.RequestNavigate( RegionNames.ContentRegion, navigatePath );
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
new file mode 100644
index 000000000..ec5cb4b86
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
@@ -0,0 +1,62 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+  public static class AeroColors
+  {
+    public static readonly ComponentResourceKey BaseColor1Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor1" );
+    public static readonly ComponentResourceKey BaseColor2Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor2" );
+    public static readonly ComponentResourceKey BaseColor3Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor3" );
+    public static readonly ComponentResourceKey BaseColor4Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor4" );
+    public static readonly ComponentResourceKey BaseColor5Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor5" );
+    public static readonly ComponentResourceKey BaseColor6Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor6" );
+    public static readonly ComponentResourceKey BaseColor7Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor7" );
+    public static readonly ComponentResourceKey BaseColor8Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor8" );
+    public static readonly ComponentResourceKey BaseColor9Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor9" );
+    public static readonly ComponentResourceKey BaseColor10Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor10" );
+    public static readonly ComponentResourceKey BaseColor11Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor11" );
+    public static readonly ComponentResourceKey BaseColor12Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor12" );
+    public static readonly ComponentResourceKey BaseColor13Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor13" );
+    public static readonly ComponentResourceKey BaseColor14Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor14" );
+    public static readonly ComponentResourceKey BaseColor15Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor15" );
+    public static readonly ComponentResourceKey BaseColor16Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor16" );
+    public static readonly ComponentResourceKey BaseColor17Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor17" );
+    //public static readonly ComponentResourceKey BaseColor18Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor18" );
+    //public static readonly ComponentResourceKey BaseColor19Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor19" );
+    //public static readonly ComponentResourceKey BaseColor20Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor20" );
+    //public static readonly ComponentResourceKey BaseColor21Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor21" );
+    //public static readonly ComponentResourceKey BaseColor22Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor22" );
+    //public static readonly ComponentResourceKey BaseColor23Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor23" );
+    public static readonly ComponentResourceKey BaseColor24Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor24" );
+    public static readonly ComponentResourceKey BaseColor25Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor25" );
+    public static readonly ComponentResourceKey BaseColor26Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor26" );
+    public static readonly ComponentResourceKey BaseColor27Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor27" );
+    public static readonly ComponentResourceKey BaseColor28Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor28" );
+    public static readonly ComponentResourceKey BaseColor29Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor29" );
+    public static readonly ComponentResourceKey BaseColor30Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor30" );
+    public static readonly ComponentResourceKey BaseColor31Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor31" );
+    public static readonly ComponentResourceKey BaseColor32Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor32" );
+    public static readonly ComponentResourceKey BaseColor33Key = new ComponentResourceKey( typeof( AeroColors ), "BaseColor33" );
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
new file mode 100644
index 000000000..0d3b20a4d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+    public class AeroTheme : Theme
+    {
+        public override Uri GetResourceUri()
+        {
+            return new Uri(
+                "/Xceed.Wpf.AvalonDock.Themes.Aero;component/Theme.xaml", 
+                UriKind.Relative);  
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
new file mode 100644
index 000000000..8b8ce9d3f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfo.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "2.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  ".0.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfoCommon.cs
new file mode 100644
index 000000000..3316fb13a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,22 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
new file mode 100644
index 000000000..926019403
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
@@ -0,0 +1,171 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:at="clr-namespace:Xceed.Wpf.AvalonDock.Themes">
+
+
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor1Key}"
+                        StartPoint="0,0"
+                        EndPoint="1,0">
+      <LinearGradientBrush.GradientStops>
+         <GradientStop Color="#EBEEFA" Offset="0" />
+         <GradientStop Color="#F4F7FC" Offset="1" />
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor2Key}" 
+                     Color="White"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor3Key}" 
+                     Color="Black"/>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor4Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStop Color="#CFCFCF" Offset="0" />
+         <GradientStop Color="#F2F2F2" Offset="1" />
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor5Key}" 
+                     Color="#898C95"/>
+
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor6Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStop Color="#FCFDFE" Offset="0" />
+         <GradientStop Color="#D2E6FA" Offset="1" />
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor7Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStop Color="#ECF5FC" Offset="0" />
+         <GradientStop Color="#98B4D2" Offset="1" />
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor8Key}"
+                     Color="#D2E6FA"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor9Key}"
+                     Color="#FFF5F4EA"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor10Key}" 
+                     Color="Black"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor11Key}" 
+                     Color="#FFBBC0C7" />
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor12Key}"
+                     Color="#555564"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor13Key}"
+                     Color="White"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor14Key}"
+                     Color="#69A1BF"/>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor15Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <GradientStop Color="#8FADCE" Offset="0" />
+      <GradientStop Color="#BDD3EF" Offset="1" />
+   </LinearGradientBrush>
+
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor16Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <GradientStop Color="#B7CAE0" Offset="0" />
+      <GradientStop Color="#E8F0FF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor17Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <GradientStop Color="#F7FCFE" Offset="0" />
+      <GradientStop Color="#81D0F1" Offset="1" />
+   </LinearGradientBrush>
+   <!--
+    <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor18Key}" 
+        Color="Black"/>
+
+    <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor20Key}" 
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor21Key}" 
+        Color="White"/>
+
+    <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor22Key}" 
+        Color="Black"/>
+
+    <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor23Key}" 
+        Color="Black"/>-->
+
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor24Key}" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Color="#FBFCFC" Offset="0" />
+      <GradientStop Color="#D7DCE4" Offset="0.5" />
+      <GradientStop Color="#CED4DF" Offset="0.5" />
+      <GradientStop Color="#CED4DF" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor25Key}" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Color="#FFFCF2" Offset="0" />
+      <GradientStop Color="#FFEDBA" Offset="0.5" />
+      <GradientStop Color="#FFE8A6" Offset="0.5" />
+      <GradientStop Color="#FFE8A6" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor26Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <GradientStop Color="#F2F2F2" Offset="0" />
+      <GradientStop Color="#CFCFCF" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="{x:Static at:AeroColors.BaseColor27Key}"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+      <GradientStop Color="#A7D9F5" Offset="0" />
+      <GradientStop Color="#BEE6FD" Offset="0.5" />
+      <GradientStop Color="#D9F0FC" Offset="0.5" />
+      <GradientStop Color="#FAFDFE" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor28Key}"
+                         Color="White"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor30Key}" 
+        Color="#CED4DF"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor31Key}" 
+        Color="#FFE8A6"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor32Key}"
+                     Color="#3C7FB1"/>
+
+   <SolidColorBrush x:Key="{x:Static at:AeroColors.BaseColor33Key}"
+        Color="#3D5277"/>
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
new file mode 100644
index 000000000..923475556
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
@@ -0,0 +1,161 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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 Xceed.Wpf.AvalonDock.Themes.Controls
+{
+    public class SplineBorder : Control
+    {
+
+        public SplineBorder()
+        {
+            //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+        }
+
+
+        #region Thickness
+
+        /// <summary>
+        /// Thickness Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ThicknessProperty =
+            DependencyProperty.Register("Thickness", typeof(double), typeof(SplineBorder),
+                new FrameworkPropertyMetadata((double)1.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        /// <summary>
+        /// Gets or sets the Thickness property.  This dependency property 
+        /// indicates the border thickness.
+        /// </summary>
+        public double Thickness
+        {
+            get { return (double)GetValue(ThicknessProperty); }
+            set { SetValue(ThicknessProperty, value); }
+        }
+
+        #endregion
+
+        #region Fill
+
+        /// <summary>
+        /// Fill Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty FillProperty =
+            DependencyProperty.Register("Fill", typeof(Brush), typeof(SplineBorder),
+                new FrameworkPropertyMetadata((Brush)null, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        /// <summary>
+        /// Gets or sets the Fill property.  This dependency property 
+        /// indicates the fill color.
+        /// </summary>
+        public Brush Fill
+        {
+            get { return (Brush)GetValue(FillProperty); }
+            set { SetValue(FillProperty, value); }
+        }
+
+        #endregion
+
+        #region Stroke
+
+        /// <summary>
+        /// Stroke Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty StrokeProperty =
+            DependencyProperty.Register("Stroke", typeof(Brush), typeof(SplineBorder),
+                new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        /// <summary>
+        /// Gets or sets the Stroke property.  This dependency property 
+        /// indicates the stroke brush.
+        /// </summary>
+        public Brush Stroke
+        {
+            get { return (Brush)GetValue(StrokeProperty); }
+            set { SetValue(StrokeProperty, value); }
+        }
+
+        #endregion
+
+        #region BottomBorderMargin
+
+        /// <summary>
+        /// BottomBorderMargin Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty BottomBorderMarginProperty =
+            DependencyProperty.Register("BottomBorderMargin", typeof(double), typeof(SplineBorder),
+                new FrameworkPropertyMetadata((double)0.0, FrameworkPropertyMetadataOptions.AffectsRender));
+
+        /// <summary>
+        /// Gets or sets the BottomBorderMargin property.  This dependency property 
+        /// indicates the adjustment for the bottom margin.
+        /// </summary>
+        public double BottomBorderMargin
+        {
+            get { return (double)GetValue(BottomBorderMarginProperty); }
+            set { SetValue(BottomBorderMarginProperty, value); }
+        }
+
+        #endregion
+
+
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            var pgFill = new PathGeometry();
+            var pfFill = new PathFigure() { IsFilled = true, IsClosed = true };
+            pfFill.StartPoint = new Point(ActualWidth, 0.0);
+
+            var q1Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0), IsStroked = false };
+            pfFill.Segments.Add(q1Fill);
+            var q2Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight ), Point2 = new Point(0, ActualHeight ), IsStroked = false };
+            pfFill.Segments.Add(q2Fill);
+
+            pfFill.Segments.Add(new LineSegment() { Point = new Point(ActualWidth, ActualHeight ), IsStroked = false });
+
+            pgFill.Figures.Add(pfFill);
+
+            drawingContext.DrawGeometry(Fill, null, pgFill);
+
+            var pgBorder = new PathGeometry();
+            var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false };
+            pfBorder.StartPoint = new Point(ActualWidth, Thickness / 2);
+
+            var q1Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0) };
+            pfBorder.Segments.Add(q1Border);
+            var q2Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight), Point2 = new Point(0.0, ActualHeight - BottomBorderMargin) };
+            pfBorder.Segments.Add(q2Border);
+
+            pgBorder.Figures.Add(pfBorder);
+
+            drawingContext.DrawGeometry(null, new Pen(Stroke, Thickness), pgBorder);
+
+            base.OnRender(drawingContext);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png
new file mode 100644
index 000000000..f68899838
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png
new file mode 100644
index 000000000..db47a05ea
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png
new file mode 100644
index 000000000..8595a9052
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png
new file mode 100644
index 000000000..82fe26619
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png
new file mode 100644
index 000000000..3997ed0e2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png
new file mode 100644
index 000000000..0816f5789
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png
new file mode 100644
index 000000000..387bbdf51
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png
new file mode 100644
index 000000000..7f12e82a6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentAsAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png
new file mode 100644
index 000000000..042f01103
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png
new file mode 100644
index 000000000..9e1fcc998
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentInside.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png
new file mode 100644
index 000000000..624755e3b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png
new file mode 100644
index 000000000..2fcab104d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png
new file mode 100644
index 000000000..1ff0015d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockDocumentTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png
new file mode 100644
index 000000000..3387e44e3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png
new file mode 100644
index 000000000..a179fc524
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/DockPaneLargeEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png
new file mode 100644
index 000000000..4c50d26d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/HTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png
new file mode 100644
index 000000000..b8f6ced2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/Locked.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png
new file mode 100644
index 000000000..abefd96b6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png
new file mode 100644
index 000000000..87b66ceda
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png
new file mode 100644
index 000000000..470548dcb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinAutoHide_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png
new file mode 100644
index 000000000..132bdfafc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png
new file mode 100644
index 000000000..abf709cb5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png
new file mode 100644
index 000000000..575e4fdb8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinClose_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png
new file mode 100644
index 000000000..86db3070d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png
new file mode 100644
index 000000000..be081925d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png
new file mode 100644
index 000000000..253f2a637
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinDocMenu_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png
new file mode 100644
index 000000000..79d8c2d0a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png
new file mode 100644
index 000000000..42ae679a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png
new file mode 100644
index 000000000..e28e0607e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMaximize_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png
new file mode 100644
index 000000000..653373ce5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png
new file mode 100644
index 000000000..31e2f1025
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png
new file mode 100644
index 000000000..25a476787
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinMenu_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png
new file mode 100644
index 000000000..1bccead4c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png
new file mode 100644
index 000000000..7c7e00321
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png
new file mode 100644
index 000000000..f3ebfe4cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/PinRestore_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png
new file mode 100644
index 000000000..c3f279f7d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Images/VTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..d35c38725
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
@@ -0,0 +1,70 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Markup;
+using System;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock Aero Theme" )]
+[assembly: AssemblyDescription( "This assembly implements the Aero Theme for the AvalonDock layout system." )]
+
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
+
+
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant( true )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[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)
+)]
+
+
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
new file mode 100644
index 000000000..d0505cfa6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
@@ -0,0 +1,1461 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockAero="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+    xmlns:avalonDockThemeControls="clr-namespace:Xceed.Wpf.AvalonDock.Themes.Controls"
+    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
+    >
+
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="Brushes.xaml"/>
+   </ResourceDictionary.MergedDictionaries>
+
+   <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+   <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
+   <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
+   <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
+   <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
+   <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
+   <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
+
+   <!--DocumentPaneControlStyle-->
+   <Style x:Key="AvalonDock_ThemeAero_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor8Key}}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+               <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto"/>
+                     <RowDefinition Height="*"/>
+                  </Grid.RowDefinitions>
+                  <!--Following border is required to catch mouse events-->
+                  <Border Background="Transparent" Grid.RowSpan="2"/>
+                  <Grid  Panel.ZIndex="1" >
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="4,0,16,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
+                     <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                Focusable="False"
+                                VerticalAlignment="Center"
+                                Grid.Column="1">
+                        <avalonDockControls:DropDownButton.DropDownContextMenu>
+                           <avalonDockControls:ContextMenuEx
+                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                              <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                 <Style TargetType="{x:Type avalonDockControls:MenuItemEx}"  BasedOn="{StaticResource {x:Type MenuItem}}">
+                                    <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
+                                    <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
+                                    <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
+                                    <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
+                                    <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
+                                 </Style>
+                              </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                           </avalonDockControls:ContextMenuEx>
+                        </avalonDockControls:DropDownButton.DropDownContextMenu>
+                        <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinDocMenu_Dark.png"/>
+                     </avalonDockControls:DropDownButton>
+                  </Grid>
+                  <Border x:Name="ContentPanel" 
+                                VerticalAlignment="Stretch" 
+                                HorizontalAlignment="Stretch"  
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                Grid.Row="1" 
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle"
+                                CornerRadius="3">
+                     <Border
+                                BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
+                                BorderThickness="1,1,1,1"
+                                CornerRadius="2"
+                                >
+                        <Border
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}" 
+                                    Background="{TemplateBinding Background}" 
+                                    Margin="2"
+                                    CornerRadius="2"
+                                    >
+                           <ContentPresenter x:Name="PART_SelectedContentHost" 
+                                                  ContentSource="SelectedContent" 
+                                                  SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                     <Setter Property="Content" TargetName="MenuDropDownButton">
+                        <Setter.Value>
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinDocMenu_Black.png"/>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+                  <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                     <Setter Property="Content" TargetName="MenuDropDownButton">
+                        <Setter.Value>
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinDocMenu_Black.png"/>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+                  <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 Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
+                  </DataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemContainerStyle">
+         <Setter.Value>
+            <Style TargetType="{x:Type TabItem}">
+               <Setter Property="Foreground" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor10Key}}"/>
+               <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"/>
+               <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}"/>
+               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+               <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+               <Setter Property="Padding" Value="2,1,2,1"/>
+               <Setter Property="Margin" Value="2,1,-15,0"/>
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type TabItem}">
+                        <Grid SnapsToDevicePixels="true">
+
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="20"/>
+                              <ColumnDefinition Width="*"/>
+                           </Grid.ColumnDefinitions>
+
+                           <avalonDockThemeControls:SplineBorder
+                                        x:Name="splineBd"
+                                        Fill="{TemplateBinding Background}"
+                                        Stroke="{TemplateBinding BorderBrush}"
+                                        BottomBorderMargin="0.5"
+                                        />
+
+                           <Border x:Name="Bd" 
+                                            Grid.Column="1"
+							                BorderBrush="{TemplateBinding BorderBrush}"
+   				                            BorderThickness="0,1,1,0" 
+                                            CornerRadius="0,2,0,0">
+                              <Border
+                                            x:Name="BdInternal"
+							                Background="{TemplateBinding Background}" 
+							                Padding="{TemplateBinding Padding}"
+                                            >
+                                 <ContentPresenter 
+								                x:Name="Content" 
+								                ContentSource="Header" 
+                                                HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                                VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                                RecognizesAccessKey="True" 
+                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                              </Border>
+                           </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                           <Trigger Property="Selector.IsSelected"
+								            Value="true">
+                              <Setter Property="BorderBrush"
+									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}" />
+                              <Setter Property="Background"
+									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" />
+                              <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                              <Setter Property="Margin" Value="-1,0,-16,-1"/>
+                              <Setter Property="Margin" TargetName="BdInternal" Value="0,0,0,-1"/>
+                              <Setter Property="Margin" TargetName="splineBd" Value="0,0,0,-1.0"/>
+                              <Setter Property="BottomBorderMargin" TargetName="splineBd" Value="1.5"/>
+                              <Setter Property="FontWeight" Value="Bold"/>
+                              <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                           </Trigger>
+                           <MultiTrigger>
+                              <MultiTrigger.Conditions>
+                                 <Condition Property="IsMouseOver" Value="true"/>
+                                 <Condition Property="Selector.IsSelected" Value="false"/>
+                              </MultiTrigger.Conditions>
+                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}"/>
+                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor17Key}}"/>
+                              <Setter Property="Panel.ZIndex" Value="0" />
+                           </MultiTrigger>
+                           <Trigger Property="IsEnabled" Value="false">
+                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}"/>
+                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}"/>
+                              <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                           </Trigger>
+                        </ControlTemplate.Triggers>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--AnchorablePaneControlStyle-->
+   <Style x:Key="AvalonDock_ThemeAero_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+      <Setter Property="TabStripPlacement" Value="Bottom"/>
+      <Setter Property="Padding" Value="0"/>
+      <Setter Property="BorderThickness" Value="0"/>
+      <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
+      <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+               <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="*"/>
+                     <RowDefinition Height="Auto"/>
+                  </Grid.RowDefinitions>
+                  <!--Following border is required to catch mouse events-->
+                  <Border Background="Transparent" Grid.RowSpan="2"/>
+                  <Border x:Name="ContentPanel" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" 
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle">
+                     <ContentPresenter x:Name="PART_SelectedContentHost"
+                                              ContentSource="SelectedContent" 
+                                              Margin="{TemplateBinding Padding}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                  </Border>
+                  <avalonDockControls:AnchorablePaneTabPanel 
+                            x:Name="HeaderPanel" 
+                            Margin="0,0,2,2" 
+                            IsItemsHost="true" 
+                            Grid.Row="1" 
+                            KeyboardNavigation.TabIndex="1"
+                            Panel.ZIndex="1"/>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                  </Trigger>
+                  <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
+                     <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
+                  </DataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+
+      <Setter Property="ItemContainerStyle">
+         <Setter.Value>
+            <Style TargetType="{x:Type TabItem}">
+               <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor4Key}}"/>
+               <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
+               <Setter Property="Foreground" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor12Key}}"/>
+               <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+               <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+               <Setter Property="Margin" Value="0,0,-1,0"/>
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type TabItem}">
+                        <Grid SnapsToDevicePixels="true">
+                           <Border x:Name="Bd" 
+							              BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="1,0,1,1"
+							              Background="{TemplateBinding Background}" 
+							              Padding="{TemplateBinding Padding}">
+                              <ContentPresenter 
+								            x:Name="Content" 
+								            ContentSource="Header" 
+                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                            RecognizesAccessKey="True" 
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                           </Border>
+                        </Grid>
+                        <ControlTemplate.Triggers>
+                           <Trigger Property="Selector.IsSelected"
+								        Value="true">
+                              <Setter Property="Background"
+									    Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}" />
+                              <Setter Property="Foreground"
+									    Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor3Key}}" />
+                              <Setter Property="Panel.ZIndex" 
+                                        Value="1" />
+                              <Setter Property="Margin" Value="0,-1,-1,-2"/>
+                           </Trigger>
+                           <MultiTrigger>
+                              <MultiTrigger.Conditions>
+                                 <Condition Property="IsMouseOver" Value="true"/>
+                                 <Condition Property="Selector.IsSelected" Value="false"/>
+                              </MultiTrigger.Conditions>
+                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor32Key}}"/>
+                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor27Key}}"/>
+                              <Setter Property="Panel.ZIndex" Value="0" />
+                           </MultiTrigger>
+                           <Trigger Property="IsEnabled" Value="false">
+                              <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor13Key}}"/>
+                              <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor9Key}}"/>
+                              <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="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
+                            BorderThickness="0,0,0,1"
+                            Padding="0,2,0,1">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <avalonDockControls:DropDownControlArea 
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <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}}"/>
+                     </avalonDockControls:DropDownControlArea>
+
+
+                     <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                Focusable="False"
+                                Grid.Column="1"
+                                Padding="-1"
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"
+                                >
+                        <Image x:Name="PART_ImgMenuPin" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Dark.png"/>
+                     </avalonDockControls:DropDownButton>
+
+                     <Button x:Name="PART_AutoHidePin" 
+                                Grid.Column="2" 
+                                Focusable="False"
+                                Padding="-1"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
+                                >
+                        <Image x:Name="PART_ImgAutoHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinAutoHide_Dark.png"/>
+                     </Button>
+                     <Button x:Name="PART_HidePin" 
+                                Grid.Column="3" 
+                                Focusable="False"
+                                Padding="-1"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                        <Image x:Name="PART_ImgHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Dark.png"/>
+                     </Button>
+
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                     <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
+                        <Setter.Value>
+                           <RotateTransform Angle="90"/>
+                        </Setter.Value>
+                     </Setter>
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}" />
+                  </DataTrigger>
+
+                  <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinAutoHide_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Black.png"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+      <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+         <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+               <StackPanel 
+                        MinWidth="4"
+                        MinHeight="4"
+                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
+            </ItemsPanelTemplate>
+         </ItemsControl.ItemsPanel>
+      </ItemsControl>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+      <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+         <ItemsControl.LayoutTransform>
+            <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
+         </ItemsControl.LayoutTransform>
+         <ItemsControl.ItemsPanel>
+            <ItemsPanelTemplate>
+               <StackPanel Orientation="Horizontal"/>
+            </ItemsPanelTemplate>
+         </ItemsControl.ItemsPanel>
+      </ItemsControl>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="AvalonDock_ThemeAero_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+      <Border 
+            x:Name="Bd"
+            Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor26Key}}"
+            BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
+            BorderThickness="1"
+            Margin="0,4,0,0"
+            Padding="2">
+         <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 Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
+         </Trigger>
+         <Trigger Property="Side" Value="Bottom">
+            <Setter Property="Margin" Value="0,4,0,0" TargetName="Bd"/>
+         </Trigger>
+         <Trigger Property="Side" Value="Top">
+            <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
+         </Trigger>
+         <MultiTrigger>
+            <MultiTrigger.Conditions>
+               <Condition Property="IsMouseOver" Value="true"/>
+               <Condition Property="Selector.IsSelected" Value="false"/>
+            </MultiTrigger.Conditions>
+            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" TargetName="Bd"/>
+            <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" TargetName="Bd"/>
+         </MultiTrigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+               <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+                  <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  <Grid x:Name="PART_DockingManagerDropTargets" >
+                     <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockAnchorableLeft.PNG" Stretch="None" />
+                     <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockAnchorableRight.PNG" Stretch="None" />
+                     <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockAnchorableBottom.PNG" Stretch="None" />
+                     <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockAnchorableTop.PNG" Stretch="None"/>
+                  </Grid>
+                  <Grid x:Name="PART_AnchorablePaneDropTargets">
+                     <Grid Width="110" Height="110" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
+                        <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
+                        </Border>
+                        <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                        </Border>
+                     </Grid>
+                  </Grid>
+                  <Grid x:Name="PART_DocumentPaneDropTargets">
+                     <Grid Width="110" Height="110" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockPaneEmpty.PNG"  Stretch="None"/>
+                        <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentTop.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentRight.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentBottom.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentLeft.png"  Stretch="None"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                        </Border>
+                     </Grid>
+                  </Grid>
+
+                  <Grid x:Name="PART_DocumentPaneFullDropTargets">
+                     <Grid Width="193" Height="191" VerticalAlignment="Center" HorizontalAlignment="Center">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                           <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
+                        <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                        </Border>
+
+                        <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
+                        </Border>
+                        <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
+                           <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
+                        </Border>
+
+                     </Grid>
+                  </Grid>
+
+               </Canvas>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentHeaderTemplate">
+      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+   </DataTemplate>
+
+   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableHeaderTemplate">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition/>
+         </Grid.ColumnDefinitions>
+         <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+         <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
+      </Grid>
+      <DataTemplate.Triggers>
+         <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
+            <Setter Property="Margin" Value="0" TargetName="title"/>
+         </DataTrigger>
+      </DataTemplate.Triggers>
+   </DataTemplate>
+
+   <DataTemplate x:Key="AvalonDock_ThemeAero_DocumentTitleTemplate">
+      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+   </DataTemplate>
+
+   <DataTemplate x:Key="AvalonDock_ThemeAero_AnchorableTitleTemplate">
+      <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="AvalonDock_ThemeAero_IconContentTemplate">
+      <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+   </DataTemplate>
+
+   <ContextMenu x:Key="AvalonDock_ThemeAero_AnchorableContextMenu">
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
+                Command="{Binding Path=DockCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
+                Command="{Binding Path=AutoHideCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
+                Command="{Binding Path=CloseCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+   </ContextMenu>
+
+   <ContextMenu x:Key="AvalonDock_ThemeAero_DocumentContextMenu">
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
+                  Command="{Binding Path=CloseCommand}"
+                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
+                Command="{Binding Path=CloseAllButThisCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
+                Command="{Binding Path=NewHorizontalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+         <MenuItem.Icon>
+            <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
+         </MenuItem.Icon>
+      </MenuItem>
+
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
+                Command="{Binding Path=NewVerticalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+         <MenuItem.Icon>
+            <Image Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
+         </MenuItem.Icon>
+      </MenuItem>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
+                Command="{Binding Path=MoveToNextTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+      <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
+                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+
+   </ContextMenu>
+
+   <!--DockingManager-->
+   <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor1Key}}"/>
+      <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeAero_DocumentPaneControlStyle}"/>
+      <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeAero_AnchorablePaneControlStyle}"/>
+      <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorSideTemplate}"/>
+      <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorGroupTemplate}"/>
+      <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorTemplate}"/>
+      <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}"/>
+      <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorableHeaderTemplate}"/>
+      <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentTitleTemplate}"/>
+      <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeAero_AnchorableTitleTemplate}"/>
+      <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeAero_AnchorableContextMenu}"/>
+      <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeAero_DocumentContextMenu}"/>
+      <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeAero_DocumentHeaderTemplate}"/>
+      <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeAero_IconContentTemplate}"/>
+      <Setter Property="GridSplitterWidth" Value="4"/>
+      <Setter Property="GridSplitterHeight" Value="4"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+               <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                        <RowDefinition Height="Auto"/>
+                     </Grid.RowDefinitions>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+                     <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
+                     <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
+                     <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
+                     <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
+                     <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
+                     <ContentPresenter 
+                                x:Name="PART_AutoHideArea"
+                                Content="{TemplateBinding AutoHideWindow}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                Grid.Column="1" Grid.Row="1"/>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!--LayoutGridResizerControl-->
+   <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+               <Border Background="{TemplateBinding Background}"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+               <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                  <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                  <!--<ContentPresenter Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                          ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                          ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>-->
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+               <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
+                  <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            >
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+                        <Border Grid.ColumnSpan="2" Background="Transparent"/>
+                        <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
+                        <!-- Close button should be moved out to the container style -->
+                        <Button 
+                                    x:Name="DocumentCloseButton" 
+                                    Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0" 
+                                    Padding="-1"
+                                    Visibility="Hidden" 
+                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                           <Image x:Name="PART_ImgPinClose" 
+                                           Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Dark.png"/>
+                        </Button>
+                     </Grid>
+                  </Border>
+               </avalonDockControls:DropDownControlArea>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
+                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
+                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                  </Trigger>
+                  <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+                     <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
+                  </DataTrigger>
+
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+               <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                  <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                     <Grid>
+                        <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 
+                                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>
+
+   <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="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"
+                        BorderThickness="1">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                     </Grid.RowDefinitions>
+                     <Border x:Name="Header"
+                                Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
+                        <avalonDockControls:AnchorablePaneTitle 
+                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
+                     </Border>
+                     <ContentPresenter 
+                                Grid.Row="1"
+                                FlowDirection="{TemplateBinding FlowDirection}"
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+                     <!--<ContentPresenter 
+                                Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                Grid.Row="1"/>-->
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <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"/>
+                     </MultiDataTrigger.Conditions>
+                     <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
+                  </MultiDataTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}"/>
+      <Setter Property="shell:WindowChrome.WindowChrome">
+         <Setter.Value>
+            <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="18"
+                    CornerRadius="3"
+                    GlassFrameThickness="0"
+                    ShowSystemMenu="False"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+               <Grid>
+                  <Border x:Name="WindowBorder" 
+                                BorderThickness="1" 
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}">
+                     <Grid Margin="3">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="18"/>
+                           <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Header"
+                                        Padding="2,0,2,0">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition Width="Auto"/>
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
+                                                  ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+
+                              <avalonDockControls:DropDownButton
+                                            x:Name="ContextMenuDropdownButton"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}"
+                                            >
+                                 <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Dark.png" Width="13"/>
+                              </avalonDockControls:DropDownButton>
+
+                              <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                 <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMaximize_Dark.png" Width="13" />
+                              </Button>
+
+                              <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                 <Image x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinRestore_Dark.png" Width="13" />
+                              </Button>
+
+                              <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                                            Grid.Column="3">
+                                 <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Dark.png" Width="13" />
+                              </Button>
+                           </Grid>
+                        </Border>
+                        <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
+                     </Grid>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Maximized">
+                     <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                  </Trigger>
+                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True">
+                     <Setter Property="BorderBrush"
+									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+                     <Setter Property="Background"
+									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor14Key}}" />
+                     <Setter Property="Background"
+									        Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor6Key}}" TargetName="Header" />
+                  </DataTrigger>
+
+                  <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMaximize_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinRestore_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Black.png"/>
+                  </Trigger>
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
+      <Setter Property="shell:WindowChrome.WindowChrome">
+         <Setter.Value>
+            <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="18"
+                    CornerRadius="7"
+                    GlassFrameThickness="0"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+               <Grid>
+                  <Border x:Name="WindowBorder" 
+                                BorderThickness="4"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
+                     <Grid >
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="18"/>
+                           <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Header" 
+                                        CornerRadius="1,1,0,0"
+                                        Padding="2,0,2,0"
+                                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor16Key}}">
+                           <Grid>
+                              <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={StaticResource BoolToVisibilityConverter}}">
+                                 <avalonDockControls:DropDownControlArea 
+                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <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
+                                            x:Name="SinglePaneContextMenu"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                 <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Dark.png" Width="13"/>
+                              </avalonDockControls:DropDownButton>
+
+                              <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                 <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMaximize_Dark.png" Width="13"/>
+                              </Button>
+
+                              <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                 <Image  x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinRestore_Dark.png" Width="13"/>
+                              </Button>
+
+                              <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                            Grid.Column="3">
+                                 <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Dark.png" Width="13"/>
+                              </Button>
+                           </Grid>
+                        </Border>
+                        <ContentPresenter
+                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
+                     </Grid>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Maximized">
+                     <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                  </Trigger>
+                  <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor15Key}}" TargetName="Header"/>
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMenu_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinMaximize_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinRestore_Black.png"/>
+                  </Trigger>
+                  <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                     <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Aero;component/Images/PinClose_Black.png"/>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor5Key}}"/>
+   </Style>
+
+
+   <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual">
+      <Setter Property="Control.Template">
+         <Setter.Value>
+            <ControlTemplate>
+               <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFF1FBFF" Offset="0"/>
+      <GradientStop Color="#FFD5F1FE" Offset="1"/>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFD9F4FF" Offset="0"/>
+      <GradientStop Color="#FF9BDDFB" Offset="1"/>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFEEEDED" Offset="0"/>
+      <GradientStop Color="#FFDDDDDD" Offset="1"/>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFEAF9FF" Offset="0"/>
+      <GradientStop Color="#FFC9EDFD" Offset="1"/>
+   </LinearGradientBrush>
+
+   <Style x:Key="AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
+      <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemFocusVisual}"/>
+      <Setter Property="Background" Value="Transparent"/>
+      <Setter Property="BorderBrush" Value="Transparent"/>
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="Padding" Value="5,0,5,0"/>
+      <Setter Property="VerticalContentAlignment" Value="Center"/>
+      <Setter Property="Cursor" Value="Hand"/>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" 
+                            Background="{TemplateBinding Background}" 
+                            CornerRadius="2" SnapsToDevicePixels="true">
+                  <Border x:Name="InnerBorder" BorderThickness="1" CornerRadius="1">
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition MaxHeight="11"/>
+                           <RowDefinition/>
+                        </Grid.RowDefinitions>
+                        <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
+                        <ContentPresenter Grid.RowSpan="2" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                     </Grid>
+                  </Border>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}"/>
+                     <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                     <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                     <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedFill}"/>
+                     <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                     <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                     <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                  </Trigger>
+                  <!--<MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="true"/>
+                                <Condition Property="IsMouseOver" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemSelectedHoverFill}"/>
+                            <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>
+
+   <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
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    CornerRadius="3,3,3,3"
+                    GlassFrameThickness="4"/>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+               <Grid>
+                  <Border x:Name="WindowBorder" BorderThickness="1"
+                                CornerRadius="3"
+                                Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor2Key}}"
+                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="54"/>
+                           <RowDefinition Height="*"/>
+                           <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+
+                        <Grid Margin="5">
+                           <Grid.RowDefinitions>
+                              <RowDefinition/>
+                              <RowDefinition/>
+                           </Grid.RowDefinitions>
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition/>
+                              </Grid.ColumnDefinitions>
+                              <Image 
+                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                            Stretch="None"
+                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
+                              <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
+                           </Grid>
+                           <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+                        </Grid>
+
+                        <Border Grid.Row="1" 
+                                        BorderBrush="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor11Key}}"
+                                        BorderThickness="0,1,0,0"
+                                        Background="{DynamicResource {x:Static avalonDockAero:AeroColors.BaseColor7Key}}"
+                                        MinHeight="200" >
+                           <Grid  Margin="5">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto"/>
+                                 <ColumnDefinition/>
+                              </Grid.ColumnDefinitions>
+                              <Grid Margin="5">
+                                 <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition/>
+                                 </Grid.RowDefinitions>
+                                 <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
+                                 <ListBox Grid.Row="1" 
+                                                     ItemsSource="{Binding Anchorables}"
+                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
+                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
+                                                     Background="Transparent" 
+                                                     BorderThickness="0"
+                                                     MaxHeight="400">
+                                    <ListBox.ItemTemplate>
+                                       <DataTemplate>
+                                          <Grid>
+                                             <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="16"/>
+                                                <ColumnDefinition Width="150"/>
+                                             </Grid.ColumnDefinitions>
+                                             <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                             <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                          </Grid>
+                                       </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                 </ListBox>
+                              </Grid>
+                              <Grid Grid.Column="1" Margin="5">
+                                 <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto"/>
+                                    <RowDefinition/>
+                                 </Grid.RowDefinitions>
+                                 <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
+                                 <ListBox 
+                                                Grid.Row="1" 
+                                                ItemsSource="{Binding Documents}" 
+                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
+                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeAero_NavigatorWindowListBoxItemStyle}"
+                                                Background="Transparent" 
+                                                BorderThickness="0" 
+                                                MaxHeight="400">
+                                    <ListBox.ItemTemplate>
+                                       <DataTemplate>
+                                          <Grid>
+                                             <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="16"/>
+                                                <ColumnDefinition Width="150"/>
+                                             </Grid.ColumnDefinitions>
+                                             <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                             <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                          </Grid>
+                                       </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                    <ListBox.ItemsPanel>
+                                       <ItemsPanelTemplate>
+                                          <WrapPanel Orientation="Vertical"/>
+                                       </ItemsPanelTemplate>
+                                    </ListBox.ItemsPanel>
+                                 </ListBox>
+                              </Grid>
+                           </Grid>
+                        </Border>
+
+                        <Grid Grid.Row="2" Margin="5">
+                           <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
+                        </Grid>
+                     </Grid>
+                  </Border>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+
+   </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj
new file mode 100644
index 000000000..9d14d5b58
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.csproj
@@ -0,0 +1,194 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Aero</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AeroColors.cs" />
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="Controls\SplineBorder.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AeroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
+      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
+      <Name>Xceed.Wpf.AvalonDock</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinAutoHide.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinClose_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinAutoHide_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinClose.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinClose_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinRestore_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinDocMenu.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinDocMenu_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMaximize.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMaximize_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMaximize_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMenu.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMenu_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMenu_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinRestore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinRestore_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableLeft.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableRight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableTop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentBottom.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentInside.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentLeft.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentRight.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockDocumentTop.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockPaneEmpty.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\HTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\Locked.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinDocMenu_Dark.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk
new file mode 100644
index 000000000..1bdc91203
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/sn.snk differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
new file mode 100644
index 000000000..8b8ce9d3f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfo.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "2.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  ".0.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfoCommon.cs
new file mode 100644
index 000000000..3316fb13a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,22 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
new file mode 100644
index 000000000..4a3e67b74
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
@@ -0,0 +1,42 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor1" 
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor2" 
+                     Color="Black"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor3" 
+                     Color="#41B1E1"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor4" 
+                     Color="#5EA1C0"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor5" 
+                     Color="#333333"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor6" 
+                     Color="#8C8E94"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeMetro_BaseColor7" 
+                     Color="#EEEEEE"/>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png
new file mode 100644
index 000000000..a786a61f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png
new file mode 100644
index 000000000..1499c434c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png
new file mode 100644
index 000000000..e6802ba30
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png
new file mode 100644
index 000000000..cd79f578a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png
new file mode 100644
index 000000000..00436bbad
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png
new file mode 100644
index 000000000..6500b08ce
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png
new file mode 100644
index 000000000..a71a8c503
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png
new file mode 100644
index 000000000..2ac776549
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentAsAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png
new file mode 100644
index 000000000..c5bed3494
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png
new file mode 100644
index 000000000..038ac8b3a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentInside.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png
new file mode 100644
index 000000000..d77a43f24
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png
new file mode 100644
index 000000000..83322201b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png
new file mode 100644
index 000000000..f8e075d92
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockDocumentTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png
new file mode 100644
index 000000000..8ad117677
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png
new file mode 100644
index 000000000..8205a0349
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/DockPaneLargeEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png
new file mode 100644
index 000000000..4c50d26d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/HTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png
new file mode 100644
index 000000000..b8f6ced2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/Locked.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png
new file mode 100644
index 000000000..abefd96b6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png
new file mode 100644
index 000000000..87b66ceda
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png
new file mode 100644
index 000000000..470548dcb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinAutoHide_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png
new file mode 100644
index 000000000..132bdfafc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png
new file mode 100644
index 000000000..abf709cb5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png
new file mode 100644
index 000000000..575e4fdb8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinClose_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png
new file mode 100644
index 000000000..86db3070d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png
new file mode 100644
index 000000000..be081925d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinDocMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png
new file mode 100644
index 000000000..79d8c2d0a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png
new file mode 100644
index 000000000..42ae679a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png
new file mode 100644
index 000000000..e28e0607e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMaximize_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png
new file mode 100644
index 000000000..653373ce5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png
new file mode 100644
index 000000000..31e2f1025
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png
new file mode 100644
index 000000000..25a476787
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinMenu_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png
new file mode 100644
index 000000000..1bccead4c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png
new file mode 100644
index 000000000..7c7e00321
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png
new file mode 100644
index 000000000..f3ebfe4cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/PinRestore_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png
new file mode 100644
index 000000000..c3f279f7d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Images/VTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
new file mode 100644
index 000000000..1223c0966
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+    public class MetroTheme : Theme
+    {
+        public override Uri GetResourceUri()
+        {
+            return new Uri(
+                "/Xceed.Wpf.AvalonDock.Themes.Metro;component/Theme.xaml", 
+                UriKind.Relative);  
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..3e3cb295b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
@@ -0,0 +1,69 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Markup;
+using System;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock Metro Theme" )]
+[assembly: AssemblyDescription( "This assembly implements the Metro Theme for the AvalonDock layout system." )]
+
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
+
+
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant( true )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[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)
+)]
+
+
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
new file mode 100644
index 000000000..d2571e840
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
@@ -0,0 +1,1523 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
+    >
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Brushes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
+    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
+    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
+    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
+    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
+    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
+
+    <Style x:Key="AvalonDock_ThemeMetro_ToolButtonStyle" 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 BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <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}"/>
+                <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor10}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="AvalonDock_ThemeMetro_ButtonStyle" 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 BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}"/>
+                <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor10}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!--DocumentPaneControlStyle-->
+    <Style x:Key="AvalonDock_ThemeMetro_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor33}"/>
+        <Setter Property="BorderBrush" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Grid  Panel.ZIndex="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,0,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
+                            <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                Focusable="False"
+                                VerticalAlignment="Center"
+                                Grid.Column="1">
+                                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                                    <avalonDockControls:ContextMenuEx
+                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
+                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
+                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
+                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
+                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
+                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
+                                            </Style>
+                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                    </avalonDockControls:ContextMenuEx>
+                                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                                <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinDocMenu.png"/>
+                            </avalonDockControls:DropDownButton>
+                        </Grid>
+                        <Border x:Name="ContentPanel" 
+                                VerticalAlignment="Stretch" 
+                                HorizontalAlignment="Stretch"  
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                Grid.Row="1" 
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle"
+                                Padding="0,1,0,2">
+                            <ContentPresenter x:Name="PART_SelectedContentHost" 
+                                              ContentSource="SelectedContent" 
+                                              Margin="0,2,0,2"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Content" TargetName="MenuDropDownButton">
+                                <Setter.Value>
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinDocMenu_Black.png"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Content" TargetName="MenuDropDownButton">
+                                <Setter.Value>
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinDocMenu_Black.png"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="True"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor31}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="False"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor30}" />
+                        </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 Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
+                        </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="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+                    <Setter Property="Padding" Value="4"/>
+                    <Setter Property="Margin" Value="2,0,2,0"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type TabItem}">
+                                <Grid SnapsToDevicePixels="true"
+                                       Margin="0,4,4,4">
+                                    <Border x:Name="Bd" 
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+   				                          BorderThickness="0,3,0,0" 
+							              Background="{TemplateBinding Background}" 
+							              Padding="{TemplateBinding Padding}">
+                                    </Border>
+                                    <ContentPresenter 
+								            x:Name="Content" 
+                                            Margin="2"
+								            ContentSource="Header" 
+                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                            RecognizesAccessKey="True" 
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected"
+								            Value="true">
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </Trigger>
+
+                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </DataTrigger>
+
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true"/>
+                                            <Condition Property="Selector.IsSelected" Value="false"/>
+                                        </MultiTrigger.Conditions>
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
+                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+                                        <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>
+
+    <!--AnchorablePaneControlStyle-->
+    <Style x:Key="AvalonDock_ThemeMetro_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+        <Setter Property="TabStripPlacement" Value="Bottom"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Border x:Name="ContentPanel" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0" 
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                Grid.Row="0" 
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle">
+                            <ContentPresenter x:Name="PART_SelectedContentHost"
+                                              ContentSource="SelectedContent" 
+                                              Margin="{TemplateBinding Padding}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="0,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
+                            <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Background" Value="Transparent"/>
+                    <Setter Property="BorderBrush" Value="Transparent"/>
+                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+                    <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="Bd" 
+							              BorderBrush="{TemplateBinding BorderBrush}"
+                                          Margin="4"
+   				                          BorderThickness="0,2,0,0" 
+							              Background="{TemplateBinding Background}" 
+							              Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter 
+								            x:Name="Content" 
+								            ContentSource="Header" 
+                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                            RecognizesAccessKey="True" 
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    </Border>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected"
+								            Value="true">
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}" />
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </Trigger>
+
+                                    <DataTrigger Binding="{Binding IsActive}" Value="True">
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                                        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </DataTrigger>
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true"/>
+                                            <Condition Property="Selector.IsSelected" Value="false"/>
+                                        </MultiTrigger.Conditions>
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
+                                        <Setter Property="Panel.ZIndex" Value="0" />
+                                    </MultiTrigger>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor13}"/>
+                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor9}"/>
+                                        <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="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="0,3,0,0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DropDownControlArea 
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                <ContentPresenter 
+                                    x:Name="Header"            
+                                    Margin="2,0,0,0"
+                                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </avalonDockControls:DropDownControlArea>
+
+
+                            <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                Focusable="False"
+                                Grid.Column="1"
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                <Image x:Name="PART_ImgMenuPin" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu.png"/>
+                            </avalonDockControls:DropDownButton>
+
+                            <Button x:Name="PART_AutoHidePin" 
+                                Grid.Column="2" 
+                                Focusable="False"
+                                Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
+                                    >
+                                <Image x:Name="PART_ImgAutoHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinAutoHide.png"/>
+                            </Button>
+                            <Button x:Name="PART_HidePin" 
+                                Grid.Column="3" 
+                                Focusable="False"
+                                Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                    >
+                                <Image x:Name="PART_ImgHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose.png"/>
+                            </Button>
+
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
+                                <Setter.Value>
+                                    <RotateTransform Angle="90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                            <Setter Property="BorderThickness" Value="0,3,0,0"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinAutoHide_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Dark.png"/>
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinAutoHide_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel 
+                        MinWidth="4"
+                        MinHeight="4"
+                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.LayoutTransform>
+                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
+            </ItemsControl.LayoutTransform>
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeMetro_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+        <Border 
+            x:Name="Bd"
+            BorderThickness="0,2,0,0"
+            BorderBrush="{TemplateBinding BorderBrush}"
+            Margin="4"
+            Padding="2">
+                <ContentPresenter 
+                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                    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 Property="BorderThickness" Value="0,0,0,2" TargetName="Bd"/>
+            </Trigger>
+            <Trigger Property="Side" Value="Bottom">
+                <Setter Property="BorderThickness" Value="0,2,0,0" TargetName="Bd"/>
+            </Trigger>
+            <Trigger Property="Side" Value="Top">
+                <Setter Property="BorderThickness" Value="0,0,0,2" TargetName="Bd"/>
+            </Trigger>            
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true"/>
+                    <Condition Property="Selector.IsSelected" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor4}"/>
+            </MultiTrigger>
+            <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="true">
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}"/>
+            </DataTrigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        <Grid x:Name="PART_DockingManagerDropTargets" >
+                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockAnchorableLeft.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockAnchorableRight.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockAnchorableBottom.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockAnchorableTop.PNG" Stretch="None"/>
+                        </Grid>
+                        <Grid x:Name="PART_AnchorablePaneDropTargets">
+                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
+                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+                            </Grid>
+                        </Grid>
+                        <Grid x:Name="PART_DocumentPaneDropTargets">
+                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockPaneEmpty.PNG"  Stretch="None"/>
+                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentTop.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+                            </Grid>
+                        </Grid>
+
+                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
+                            <Grid Width="184" Height="184" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
+                                <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+
+                                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
+                                </Border>
+
+                            </Grid>
+                        </Grid>
+
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentHeaderTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableHeaderTemplate">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
+                <Setter Property="Margin" Value="0" TargetName="title"/>
+            </DataTrigger>
+        </DataTemplate.Triggers>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeMetro_DocumentTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeMetro_AnchorableTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeMetro_IconContentTemplate">
+        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+    </DataTemplate>
+
+    <ContextMenu x:Key="AvalonDock_ThemeMetro_AnchorableContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
+                Command="{Binding Path=DockCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
+                Command="{Binding Path=AutoHideCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
+                Command="{Binding Path=CloseCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <ContextMenu x:Key="AvalonDock_ThemeMetro_DocumentContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
+                  Command="{Binding Path=CloseCommand}"
+                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
+                Command="{Binding Path=CloseAllButThisCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
+                Command="{Binding Path=NewHorizontalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <MenuItem.Icon>
+                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
+            </MenuItem.Icon>
+        </MenuItem>
+
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
+                Command="{Binding Path=NewVerticalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <MenuItem.Icon>
+                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
+                Command="{Binding Path=MoveToNextTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
+                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <!--DockingManager-->
+    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
+        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeMetro_DocumentPaneControlStyle}"/>
+        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeMetro_AnchorablePaneControlStyle}"/>
+        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorSideTemplate}"/>
+        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorGroupTemplate}"/>
+        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorTemplate}"/>
+        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}"/>
+        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableHeaderTemplate}"/>
+        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentTitleTemplate}"/>
+        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableTitleTemplate}"/>
+        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeMetro_AnchorableContextMenu}"/>
+        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeMetro_DocumentContextMenu}"/>
+        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeMetro_DocumentHeaderTemplate}"/>
+        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeMetro_IconContentTemplate}"/>
+        <Setter Property="GridSplitterWidth" Value="5"/>
+        <Setter Property="GridSplitterHeight" Value="5"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
+                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
+                            <ContentPresenter 
+                                x:Name="PART_AutoHideArea"
+                                Content="{TemplateBinding AutoHideWindow}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                Grid.Column="1" Grid.Row="1"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--LayoutGridResizerControl-->
+    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                    <Border Background="{TemplateBinding Background}" Margin="2"/>
+                </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}}" >
+                        <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="0,2,0,1">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
+                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
+                                <!-- Close button should be moved out to the container style -->
+                                <Button 
+                                    x:Name="DocumentCloseButton" 
+                                    Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0" 
+                                    Visibility="Hidden" 
+                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                                    <Image x:Name="PART_ImgPinClose" 
+                                           Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose.png"/>
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </avalonDockControls:DropDownControlArea>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                            <Setter Property="Source" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                            <Setter Property="Source" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="DocumentCloseButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+                    <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <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 
+                                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>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+                    <Border 
+                        x:Name="Bd"
+                        Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Border x:Name="Header"
+                                Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor16}">
+                                <avalonDockControls:AnchorablePaneTitle 
+                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </Border>
+                            <ContentPresenter 
+                                Grid.Row="1"
+                                FlowDirection="{TemplateBinding FlowDirection}"
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+                            <!--<ContentPresenter 
+                                Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                Grid.Row="1"/>-->
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <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"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    CornerRadius="0"
+                    ResizeBorderThickness="10"
+                    CaptionHeight="24"
+                    GlassFrameThickness="0"
+                    ShowSystemMenu="False"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" 
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="1">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="24"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto"/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+
+                                <Border x:Name="bd" Width="5" VerticalAlignment="Stretch" Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor5}"/>
+
+                                <Border x:Name="Header"
+                                        Padding="2,0,2,0"
+                                        Grid.Column="1">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter
+                                            Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
+                                            ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+
+                                        <avalonDockControls:DropDownButton
+                                            x:Name="ContextMenuDropdownButton"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
+                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu.png" Width="13"/>
+                                        </avalonDockControls:DropDownButton>
+
+                                        <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMaximize.png" Width="13" />
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinRestore.png" Width="13" />
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                                            Grid.Column="3">
+                                            <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose.png" Width="13" />
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1" Grid.ColumnSpan="2"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True">
+                            <Setter 
+                                TargetName="bd"
+                                Property="Background"
+								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                            <Setter 
+                                TargetName="Header"
+                                Property="Background"
+								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" />
+                            <Setter 
+                                TargetName="Header"
+                                Property="TextElement.Foreground"
+								Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" />
+                        </DataTrigger>
+
+                        <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMaximize_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinRestore_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Black.png"/>
+                        </Trigger>                        
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    CornerRadius="0"
+                    ResizeBorderThickness="10"
+                    CaptionHeight="24"
+                    GlassFrameThickness="0"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" 
+                                BorderThickness="1"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{DynamicResource AvalonDock_ThemeMetro_BaseColor6}">
+                            <Grid >
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="24"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border x:Name="Header" 
+                                        Padding="2,0,2,0"
+                                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}">
+                                    <Grid>
+                                        <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={StaticResource BoolToVisibilityConverter}}">
+                                            <avalonDockControls:DropDownControlArea 
+                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                    <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
+                                            x:Name="SinglePaneContextMenu"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ToolButtonStyle}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu.png" Width="13"/>
+                                        </avalonDockControls:DropDownButton>
+
+                                        <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMaximize.png" Width="13"/>
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                            <Image  x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinRestore.png" Width="13"/>
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource AvalonDock_ThemeMetro_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                            Grid.Column="3">
+                                            <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose.png" Width="13"/>
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter
+                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor3}" TargetName="Header"/>
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}" TargetName="Header"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinRestore_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMaximize_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Dark.png"/>
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinMaximize_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinRestore_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.Metro;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeMetro_BaseColor1}"/>
+    </Style>
+
+
+    <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFF1FBFF" Offset="0"/>
+        <GradientStop Color="#FFD5F1FE" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFD9F4FF" Offset="0"/>
+        <GradientStop Color="#FF9BDDFB" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEEEDED" Offset="0"/>
+        <GradientStop Color="#FFDDDDDD" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEAF9FF" Offset="0"/>
+        <GradientStop Color="#FFC9EDFD" Offset="1"/>
+    </LinearGradientBrush>
+
+    <Style x:Key="AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemFocusVisual}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="5,0,5,0"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" 
+                            Background="{TemplateBinding Background}" 
+                            SnapsToDevicePixels="true">
+                        <Border x:Name="InnerBorder" BorderThickness="1" >
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition MaxHeight="11"/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
+                                <ContentPresenter Grid.RowSpan="2" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            </Grid>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}"/>
+                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedFill}"/>
+                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                        </Trigger>
+                        <!--<MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="true"/>
+                                <Condition Property="IsMouseOver" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemSelectedHoverFill}"/>
+                            <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>
+
+    <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
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    GlassFrameThickness="4"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" BorderThickness="1"
+                                Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor2}"
+                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="54"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+
+                                <Grid Margin="5">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Image 
+                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                            Stretch="None"
+                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
+                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
+                                    </Grid>
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+                                </Grid>
+
+                                <Border Grid.Row="1" 
+                                        BorderBrush="{DynamicResource AvalonDock_ThemeMetro_BaseColor11}"
+                                        BorderThickness="0,1,0,0"
+                                        Background="{DynamicResource AvalonDock_ThemeMetro_BaseColor7}"
+                                        MinHeight="200" >
+                                    <Grid  Margin="5">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Grid Margin="5">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto"/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
+                                            <ListBox Grid.Row="1" 
+                                                     ItemsSource="{Binding Anchorables}"
+                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
+                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
+                                                     Background="Transparent" 
+                                                     BorderThickness="0"
+                                                     MaxHeight="400">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="16"/>
+                                                                <ColumnDefinition Width="150"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                                        </Grid>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                            </ListBox>
+                                        </Grid>
+                                        <Grid Grid.Column="1" Margin="5">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto"/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
+                                            <ListBox 
+                                                Grid.Row="1" 
+                                                ItemsSource="{Binding Documents}" 
+                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
+                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeMetro_NavigatorWindowListBoxItemStyle}"
+                                                Background="Transparent" 
+                                                BorderThickness="0" 
+                                                MaxHeight="400">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="16"/>
+                                                                <ColumnDefinition Width="150"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                                        </Grid>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                                <ListBox.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel Orientation="Vertical"/>
+                                                    </ItemsPanelTemplate>
+                                                </ListBox.ItemsPanel>
+                                            </ListBox>
+                                        </Grid>
+                                    </Grid>
+                                </Border>
+
+                                <Grid Grid.Row="2" Margin="5">
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
new file mode 100644
index 000000000..4b473bc58
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.csproj
@@ -0,0 +1,121 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{89286EB4-B4A1-418C-839A-067B00F442D8}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes.Metro</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Metro</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MetroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
+      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
+      <Name>Xceed.Wpf.AvalonDock</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk
new file mode 100644
index 000000000..1bdc91203
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/sn.snk differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
new file mode 100644
index 000000000..8b8ce9d3f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfo.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "2.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  ".0.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfoCommon.cs
new file mode 100644
index 000000000..3316fb13a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,22 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
new file mode 100644
index 000000000..98b4b3911
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
@@ -0,0 +1,195 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+
+    <DrawingBrush x:Key="AvalonDock_ThemeVS2010_BaseColor1" 
+                  TileMode="Tile"  
+                Viewport="0 0 5 5" 
+				ViewportUnits="Absolute" 
+				Stretch="None">
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="#2C3D5A">
+                    <GeometryDrawing.Geometry>
+                        <RectangleGeometry Rect="0,0,10,10"/>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing>
+                    <GeometryDrawing.Pen>
+                        <Pen Thickness="1" Brush="#35496A" />
+                    </GeometryDrawing.Pen>
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <LineGeometry StartPoint="0,0" EndPoint="10,10" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing>
+                    <GeometryDrawing.Pen>
+                        <Pen Thickness="1" Brush="#293955" />
+                    </GeometryDrawing.Pen>
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <LineGeometry StartPoint="1,0" EndPoint="10,9" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor2" 
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor3" 
+                     Color="Black"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor4" 
+                     Color="Transparent"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor5" 
+                     Color="#293955"/>
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor6"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Color="#50FFE8A6" Offset="0" />
+            <GradientStop Color="#50FFE8A6" Offset="0.5" />
+            <GradientStop Color="#50FFEDBA" Offset="0.5" />
+            <GradientStop Color="#50FFFCF2" Offset="1" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor7"
+                         StartPoint="0,1"
+                         EndPoint="0,0">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Color="#FFCED4DB" Offset="0" />
+            <GradientStop Color="#FFD4DBE4" Offset="0.1" />
+            <GradientStop Color="#FFD4DDEA" Offset="0.5" />
+            <GradientStop Color="#FFC8D5E8" Offset="1" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor8"
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor9"
+                     Color="#FFF5F4EA"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor10" 
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor11" 
+                     Color="#FFBBC0C7" />
+
+    <!--<SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor12"
+                     Color="White"/>-->
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor13"
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor14"
+                     Color="White"/>
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor15"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#FFFCF2" Offset="0" />
+        <GradientStop Color="#FFEDBA" Offset="0.5" />
+        <GradientStop Color="#FFE8A6" Offset="0.5" />
+        <GradientStop Color="#FFE8A6" Offset="1" />
+    </LinearGradientBrush>
+
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor16"
+                         StartPoint="0,0"
+                         EndPoint="0,1">
+        <GradientStop Color="#4D6082" Offset="0" />
+        <GradientStop Color="#3D5277" Offset="1" />
+    </LinearGradientBrush>
+
+    <!--<SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor17" 
+        Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor18" 
+        Color="Black"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor20" 
+                     Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor21" 
+        Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor22" 
+        Color="Black"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor23" 
+        Color="Black"/>-->
+
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor24" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#FBFCFC" Offset="0" />
+        <GradientStop Color="#D7DCE4" Offset="0.5" />
+        <GradientStop Color="#CED4DF" Offset="0.5" />
+        <GradientStop Color="#CED4DF" Offset="1" />
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor25" StartPoint="0,0" EndPoint="0,1">
+        <GradientStop Color="#FFFCF2" Offset="0" />
+        <GradientStop Color="#FFEDBA" Offset="0.5" />
+        <GradientStop Color="#FFE8A6" Offset="0.5" />
+        <GradientStop Color="#FFE8A6" Offset="1" />
+    </LinearGradientBrush>
+
+    <!--<LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor26" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Color="#50FFE8A6" Offset="0" />
+            <GradientStop Color="#50FFE8A6" Offset="0.5" />
+            <GradientStop Color="#50FFEDBA" Offset="0.5" />
+            <GradientStop Color="#50FFFCF2" Offset="1" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_BaseColor27"
+                         StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStop Color="#50FFE8A6" Offset="0" />
+            <GradientStop Color="#50FFE8A6" Offset="0.5" />
+            <GradientStop Color="#50FFEDBA" Offset="0.5" />
+            <GradientStop Color="#50FFFCF2" Offset="1" />
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>-->
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor28"
+                         Color="White"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor30" 
+        Color="#CED4DF"/>
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor31" 
+        Color="#FFE8A6"/>
+
+    <!--<SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor32"
+                     Color="Transparent"/>-->
+
+    <SolidColorBrush x:Key="AvalonDock_ThemeVS2010_BaseColor33"
+        Color="#3D5277"/>    
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png
new file mode 100644
index 000000000..a786a61f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png
new file mode 100644
index 000000000..1499c434c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png
new file mode 100644
index 000000000..e6802ba30
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png
new file mode 100644
index 000000000..cd79f578a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png
new file mode 100644
index 000000000..00436bbad
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png
new file mode 100644
index 000000000..6500b08ce
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png
new file mode 100644
index 000000000..a71a8c503
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png
new file mode 100644
index 000000000..2ac776549
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentAsAnchorableTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png
new file mode 100644
index 000000000..c5bed3494
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png
new file mode 100644
index 000000000..038ac8b3a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentInside.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png
new file mode 100644
index 000000000..d77a43f24
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png
new file mode 100644
index 000000000..83322201b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png
new file mode 100644
index 000000000..f8e075d92
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockDocumentTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png
new file mode 100644
index 000000000..8ad117677
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png
new file mode 100644
index 000000000..8205a0349
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/DockPaneLargeEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png
new file mode 100644
index 000000000..4c50d26d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/HTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png
new file mode 100644
index 000000000..b8f6ced2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/Locked.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png
new file mode 100644
index 000000000..abefd96b6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png
new file mode 100644
index 000000000..87b66ceda
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png
new file mode 100644
index 000000000..470548dcb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinAutoHide_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png
new file mode 100644
index 000000000..132bdfafc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png
new file mode 100644
index 000000000..abf709cb5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png
new file mode 100644
index 000000000..575e4fdb8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinClose_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png
new file mode 100644
index 000000000..86db3070d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png
new file mode 100644
index 000000000..be081925d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinDocMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png
new file mode 100644
index 000000000..79d8c2d0a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png
new file mode 100644
index 000000000..42ae679a3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png
new file mode 100644
index 000000000..e28e0607e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMaximize_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png
new file mode 100644
index 000000000..653373ce5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png
new file mode 100644
index 000000000..31e2f1025
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png
new file mode 100644
index 000000000..25a476787
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinMenu_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png
new file mode 100644
index 000000000..1bccead4c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png
new file mode 100644
index 000000000..7c7e00321
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Black.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png
new file mode 100644
index 000000000..f3ebfe4cd
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/PinRestore_Dark.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png
new file mode 100644
index 000000000..c3f279f7d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Images/VTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..d6b46f84f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
@@ -0,0 +1,68 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Markup;
+using System;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyDescription( "This assembly implements the VS2010 Theme for the AvalonDock layout system." )]
+
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
+
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant( true )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[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)
+)]
+
+
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
new file mode 100644
index 000000000..f137f8882
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
@@ -0,0 +1,1575 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:localThemes="clr-namespace:Xceed.Wpf.AvalonDock.Themes"
+    xmlns:shell="clr-namespace:Microsoft.Windows.Shell;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters;assembly=Xceed.Wpf.AvalonDock"
+    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties;assembly=Xceed.Wpf.AvalonDock"
+    >
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Brushes.xaml"/>
+    </ResourceDictionary.MergedDictionaries>
+
+    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
+    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
+    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
+    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
+    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
+    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
+
+    <Style x:Key="AvalonDock_ThemeVS2010_ToolButtonStyle" 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 BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
+                <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+            </Trigger>
+            <Trigger Property="IsChecked" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
+                <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <Style x:Key="AvalonDock_ThemeVS2010_ButtonStyle" 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 BorderBrush="{TemplateBinding BorderBrush}"
+                            Background="{TemplateBinding Background}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}"/>
+                <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!--DocumentPaneControlStyle-->
+    <Style x:Key="AvalonDock_ThemeVS2010_DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
+        <Setter Property="BorderBrush" Value="{x:Null}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Grid  Panel.ZIndex="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,0,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
+                            <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                Focusable="False"
+                                VerticalAlignment="Center"
+                                Grid.Column="1">
+                                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                                    <avalonDockControls:ContextMenuEx
+                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
+                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
+                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
+                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
+                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
+                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
+                                            </Style>
+                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                    </avalonDockControls:ContextMenuEx>
+                                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                                <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinDocMenu.png"/>
+                            </avalonDockControls:DropDownButton>
+                        </Grid>
+                        <Border x:Name="ContentPanel" 
+                                VerticalAlignment="Stretch" 
+                                HorizontalAlignment="Stretch"  
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0"
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                Grid.Row="1" 
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle"
+                                CornerRadius="3"
+                                Padding="0,1,0,2">
+                            <ContentPresenter x:Name="PART_SelectedContentHost" 
+                                              ContentSource="SelectedContent" 
+                                              Margin="0,2,0,2"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Content" TargetName="MenuDropDownButton">
+                                <Setter.Value>
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinDocMenu_Black.png"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Content" TargetName="MenuDropDownButton">
+                                <Setter.Value>
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinDocMenu_Black.png"/>
+                                </Setter.Value>
+                            </Setter>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="True"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+                        </MultiDataTrigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsActive}" Value="False"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SelectedContent.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+                        </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 Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
+                        </DataTrigger>                        
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}"/>                   
+                    <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
+                    <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
+                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+                    <Setter Property="Padding" Value="2,0,2,0"/>
+                    <Setter Property="Margin" Value="2,0,2,0"/>
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="{x:Type TabItem}">
+                                <Grid SnapsToDevicePixels="true">
+                                    <Border x:Name="Bd" 
+							              BorderBrush="{TemplateBinding BorderBrush}"
+   				                          BorderThickness="1,1,1,0" 
+                                          CornerRadius="2,2,0,0"
+							              Background="{TemplateBinding Background}" 
+							              Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter 
+								            x:Name="Content" 
+								            ContentSource="Header" 
+                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                            RecognizesAccessKey="True" 
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    </Border>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected"
+								            Value="true">
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}" />
+                                        <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}" />
+                                        <Setter Property="Foreground"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"/>
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                        <Setter Property="Margin" Value="-1,0,-1,-4"/>
+                                        <Setter Property="Margin" TargetName="Content" Value="0,0,0,3"/>
+                                    </Trigger>
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsActive}" Value="True"/>
+                                            <Condition Binding="{Binding IsLastFocusedDocument}" Value="True"/>
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+                                        <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}" />
+                                        <Setter Property="Foreground"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"/>
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </MultiDataTrigger>
+
+                                    <MultiDataTrigger>
+                                        <MultiDataTrigger.Conditions>
+                                            <Condition Binding="{Binding IsActive}" Value="False"/>
+                                            <Condition Binding="{Binding IsLastFocusedDocument}" Value="True"/>
+                                        </MultiDataTrigger.Conditions>
+                                        <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+                                        <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}" />
+                                        <Setter Property="Foreground"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"/>
+                                        <Setter Property="Panel.ZIndex" 
+                                            Value="1" />
+                                    </MultiDataTrigger>
+
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true"/>
+                                            <Condition Property="Selector.IsSelected" Value="false"/>
+                                        </MultiTrigger.Conditions>
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}"/>
+                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}"/>
+                                        <Setter Property="Panel.ZIndex" Value="0" />
+                                    </MultiTrigger>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}"/>
+                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}"/>
+                                        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                                    </Trigger>
+                                </ControlTemplate.Triggers>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--AnchorablePaneControlStyle-->
+    <Style x:Key="AvalonDock_ThemeVS2010_AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+        <Setter Property="TabStripPlacement" Value="Bottom"/>
+        <Setter Property="Padding" Value="0"/>
+        <Setter Property="BorderThickness" Value="0"/>
+        <Setter Property="Foreground" Value="{Binding Model.Root.Manager.Foreground, RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="Background" Value="{Binding Model.Root.Manager.Background, RelativeSource={RelativeSource Self}}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Border x:Name="ContentPanel" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0" 
+                                KeyboardNavigation.DirectionalNavigation="Contained"
+                                Grid.Row="0" 
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle">
+                            <ContentPresenter x:Name="PART_SelectedContentHost"
+                                              ContentSource="SelectedContent" 
+                                              Margin="{TemplateBinding Padding}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="0,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="1"/>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Items.Count, RelativeSource={RelativeSource Self}}" Value="1">
+                            <Setter Property="Margin" Value="0" TargetName="HeaderPanel"/>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
+                    <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor4}"/>
+                    <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"/>
+                    <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="Bd" 
+							              BorderBrush="{TemplateBinding BorderBrush}"
+   				                          BorderThickness="1,0,1,1" 
+                                          CornerRadius="0,0,2,2"
+							              Background="{TemplateBinding Background}" 
+							              Padding="{TemplateBinding Padding}">
+                                        <ContentPresenter 
+								            x:Name="Content" 
+								            ContentSource="Header" 
+                                            HorizontalAlignment="{Binding HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" 
+                                            VerticalAlignment="{Binding VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"
+                                            RecognizesAccessKey="True" 
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                                    </Border>
+                                </Grid>
+                                <ControlTemplate.Triggers>
+                                    <Trigger Property="Selector.IsSelected"
+								        Value="true">
+                                            <Setter Property="BorderBrush"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor8}" />
+                                            <Setter Property="Background"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}" />
+                                            <Setter Property="Foreground"
+									    Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"/>
+                                            <Setter Property="Panel.ZIndex" 
+                                        Value="1" />
+                                        <Setter Property="Margin" Value="0,-2,-1,0"/>
+                                        <Setter Property="Margin" TargetName="Content" Value="0,1,0,0"/>
+                                    </Trigger>
+                                    <MultiTrigger>
+                                        <MultiTrigger.Conditions>
+                                            <Condition Property="IsMouseOver" Value="true"/>
+                                            <Condition Property="Selector.IsSelected" Value="false"/>
+                                        </MultiTrigger.Conditions>
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}"/>
+                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}"/>
+                                        <Setter Property="Panel.ZIndex" Value="0" />
+                                    </MultiTrigger>
+                                    <Trigger Property="IsEnabled" Value="false">
+                                        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor13}"/>
+                                        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor9}"/>
+                                        <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="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="2,2,0,0"
+                            Padding="0,2,0,1">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DropDownControlArea 
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                <ContentPresenter 
+                                    x:Name="Header"            
+                                    Margin="2,0,0,0"
+                                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                                    Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                    ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </avalonDockControls:DropDownControlArea>
+
+
+                            <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                VerticalAlignment="Center"
+                                Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                Focusable="False"
+                                Grid.Column="1"
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                <Image x:Name="PART_ImgMenuPin" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu.png"/>
+                            </avalonDockControls:DropDownButton>
+
+                            <Button x:Name="PART_AutoHidePin" 
+                                Grid.Column="2" 
+                                Focusable="False"
+                                Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}"
+                                    >
+                                <Image x:Name="PART_ImgAutoHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinAutoHide.png"/>
+                            </Button>
+                            <Button x:Name="PART_HidePin" 
+                                Grid.Column="3" 
+                                Focusable="False"
+                                Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                VerticalAlignment="Center"
+                                HorizontalAlignment="Center"
+                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                    >
+                                <Image x:Name="PART_ImgHidePin" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose.png"/>
+                            </Button>
+
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
+                                <Setter.Value>
+                                    <RotateTransform Angle="90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}" />
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Model.IsActive, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinAutoHide_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Dark.png"/>
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="MenuDropDownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgMenuPin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_AutoHidePin" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgAutoHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinAutoHide_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_HidePin" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgHidePin" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel 
+                        MinWidth="4"
+                        MinHeight="4"
+                        Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.LayoutTransform>
+                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
+            </ItemsControl.LayoutTransform>
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AvalonDock_ThemeVS2010_AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+        <Border 
+            x:Name="Bd"
+            Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}"
+            BorderThickness="1"
+            CornerRadius="3,3,0,0"
+            Margin="0,4,0,0"
+            Padding="2">
+                <ContentPresenter 
+                    TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                    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 Property="CornerRadius" Value="0,0,3,3" TargetName="Bd"/>
+                <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
+            </Trigger>
+            <Trigger Property="Side" Value="Bottom">
+                <Setter Property="CornerRadius" Value="3,3,0,0" TargetName="Bd"/>
+                <Setter Property="Margin" Value="0,4,0,0" TargetName="Bd"/>
+            </Trigger>
+            <Trigger Property="Side" Value="Top">
+                <Setter Property="CornerRadius" Value="0,0,3,3" TargetName="Bd"/>
+                <Setter Property="Margin" Value="0,0,0,4" TargetName="Bd"/>
+            </Trigger>            
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver" Value="true"/>
+                    <Condition Property="Selector.IsSelected" Value="false"/>
+                </MultiTrigger.Conditions>
+                <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor14}" TargetName="Bd"/>
+                <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor6}" TargetName="Bd"/>
+            </MultiTrigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        <Grid x:Name="PART_DockingManagerDropTargets" >
+                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockAnchorableLeft.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockAnchorableRight.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockAnchorableBottom.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockAnchorableTop.PNG" Stretch="None"/>
+                        </Grid>
+                        <Grid x:Name="PART_AnchorablePaneDropTargets">
+                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockPaneEmpty.png" Stretch="None" Margin="0,0.5,0,-0.5"/>
+                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="0,3.5,0, 0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" />
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="0,-0.5,0,0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1" Margin="0,0.5,0,0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+                            </Grid>
+                        </Grid>
+                        <Grid x:Name="PART_DocumentPaneDropTargets">
+                            <Grid Width="112" Height="112" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockPaneEmpty.PNG"  Stretch="None"/>
+                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentTop.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1" Margin="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+                            </Grid>
+                        </Grid>
+
+                        <Grid x:Name="PART_DocumentPaneFullDropTargets">
+                            <Grid Width="184" Height="184" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="5" Grid.RowSpan="5" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockPaneLargeEmpty.PNG"  Stretch="None"/>
+                                <Border Name="PART_DocumentPaneFullDropTargetTop" Grid.Column="2" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentTop.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetRight" Grid.Column="3" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentRight.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetBottom" Grid.Column="2" Grid.Row="3">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentBottom.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetLeft" Grid.Column="1" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentLeft.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneFullDropTargetInto" Grid.Column="2" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentInside.png"  Stretch="None"/>
+                                </Border>
+
+                                <Border Name="PART_DocumentPaneDropTargetTopAsAnchorablePane" Grid.Column="2" Grid.Row="0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableTop.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetRightAsAnchorablePane" Grid.Column="4" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableRight.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetBottomAsAnchorablePane" Grid.Column="2" Grid.Row="4">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableBottom.png"  Stretch="None" Margin="2"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetLeftAsAnchorablePane" Grid.Column="0" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/DockDocumentAsAnchorableLeft.png"  Stretch="None" Margin="2"/>
+                                </Border>
+
+                            </Grid>
+                        </Grid>
+
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentHeaderTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableHeaderTemplate">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
+                <Setter Property="Margin" Value="0" TargetName="title"/>
+            </DataTrigger>
+        </DataTemplate.Triggers>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeVS2010_DocumentTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeVS2010_AnchorableTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="AvalonDock_ThemeVS2010_IconContentTemplate">
+        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+    </DataTemplate>
+
+    <ContextMenu x:Key="AvalonDock_ThemeVS2010_AnchorableContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
+                Command="{Binding Path=DockCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
+                Command="{Binding Path=AutoHideCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
+                Command="{Binding Path=CloseCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <ContextMenu x:Key="AvalonDock_ThemeVS2010_DocumentContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
+                  Command="{Binding Path=CloseCommand}"
+                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
+                Command="{Binding Path=CloseAllButThisCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
+                Command="{Binding Path=NewHorizontalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <MenuItem.Icon>
+                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/HTabGroup.png" Stretch="Uniform" Width="14"/>
+            </MenuItem.Icon>
+        </MenuItem>
+
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
+                Command="{Binding Path=NewVerticalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
+            <MenuItem.Icon>
+            <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Aero/Images/VTabGroup.png" Stretch="Uniform" Width="14"/>
+            </MenuItem.Icon>
+        </MenuItem>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
+                Command="{Binding Path=MoveToNextTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
+                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <!--DockingManager-->
+    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor1}"/>
+        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentPaneControlStyle}"/>
+        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorablePaneControlStyle}"/>
+        <Setter Property="AnchorSideTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorSideTemplate}"/>
+        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorGroupTemplate}"/>
+        <Setter Property="AnchorTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorTemplate}"/>
+        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}"/>
+        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableHeaderTemplate}"/>
+        <Setter Property="DocumentTitleTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentTitleTemplate}"/>
+        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableTitleTemplate}"/>
+        <Setter Property="AnchorableContextMenu" Value="{StaticResource AvalonDock_ThemeVS2010_AnchorableContextMenu}"/>
+        <Setter Property="DocumentContextMenu" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentContextMenu}"/>
+        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_DocumentHeaderTemplate}"/>
+        <Setter Property="IconContentTemplate" Value="{StaticResource AvalonDock_ThemeVS2010_IconContentTemplate}"/>
+        <Setter Property="GridSplitterWidth" Value="4"/>
+        <Setter Property="GridSplitterHeight" Value="4"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
+                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
+                            <ContentPresenter 
+                                x:Name="PART_AutoHideArea"
+                                Content="{TemplateBinding AutoHideWindow}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                Grid.Column="1" Grid.Row="1"/>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--LayoutGridResizerControl-->
+    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                    <Border Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                        <!--<ContentPresenter Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                          ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                          ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>-->
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+                    <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
+                        <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            Padding="0,2,0,1">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
+                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
+                                <!-- Close button should be moved out to the container style -->
+                                <Button 
+                                    x:Name="DocumentCloseButton" 
+                                    Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                    VerticalAlignment="Center"
+                                    HorizontalAlignment="Center"
+                                    Grid.Column="1" 
+                                    Margin="5,0,0,0" 
+                                    Visibility="Hidden" 
+                                    Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                                    <Image x:Name="PART_ImgPinClose" 
+                                           Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose.png"/>
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </avalonDockControls:DropDownControlArea>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsLastFocusedDocument}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                            <Setter Property="Source" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
+                        </DataTrigger>
+                        <DataTrigger Binding="{Binding Path=IsActive}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                            <Setter Property="Source" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png" TargetName="PART_ImgPinClose"  />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="DocumentCloseButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+                    <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <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 
+                                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>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+                    <Border 
+                        x:Name="Bd"
+                        Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Border x:Name="Header"
+                                    CornerRadius="2,2,0,0"
+                                Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
+                                <avalonDockControls:AnchorablePaneTitle 
+                                    Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </Border>
+                            <ContentPresenter 
+                                Grid.Row="1"
+                                FlowDirection="{TemplateBinding FlowDirection}"
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+                            <!--<ContentPresenter 
+                                Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                Grid.Row="1"/>-->
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <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"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+        <Setter Property="Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor10}"/>
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor33}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="18"
+                    CornerRadius="3"
+                    GlassFrameThickness="0"
+                    ShowSystemMenu="False"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" 
+                                BorderThickness="1" 
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}">
+                            <Grid Margin="3">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="18"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border x:Name="Header"
+                                        Padding="2,0,2,0">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition Width="Auto"/>
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
+                                                  ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                                  ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+
+                                        <avalonDockControls:DropDownButton
+                                            x:Name="ContextMenuDropdownButton"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.DocumentContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=RootDocumentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_CxMenu_Hint}">
+                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu.png" Width="13"/>
+                                        </avalonDockControls:DropDownButton>
+
+                                        <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize.png" Width="13" />
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore.png" Width="13" />
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                                            Grid.Column="3">
+                                            <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose.png" Width="13" />
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="True"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor31}" />
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor25}" TargetName="Header" />
+                            <Setter Property="TextElement.Foreground"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}"  TargetName="Header"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Dark.png"/>
+                        </MultiDataTrigger>
+
+                        <MultiDataTrigger>
+                            <MultiDataTrigger.Conditions>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsActive}" Value="False"/>
+                                <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.RootDocument.IsLastFocusedDocument}" Value="True"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="BorderBrush"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor30}" />
+                            <Setter Property="Background"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor24}" TargetName="Header" />
+                            <Setter Property="TextElement.Foreground"
+									        Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Dark.png"/>
+                        </MultiDataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="ContextMenuDropdownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="ContextMenuDropdownButton" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Black.png"/>
+                        </Trigger>                        
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="18"
+                    CornerRadius="7"
+                    GlassFrameThickness="0"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" 
+                                BorderThickness="4"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
+                            <Grid >
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="18"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Border x:Name="Header" 
+                                        CornerRadius="1,1,0,0"
+                                        Padding="2,0,2,0"
+                                        TextElement.Foreground="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor16}">
+                                    <Grid>
+                                        <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={StaticResource BoolToVisibilityConverter}}">
+                                            <avalonDockControls:DropDownControlArea 
+                                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                                DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                                    <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
+                                            x:Name="SinglePaneContextMenu"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ToolButtonStyle}"
+                                            Focusable="False"
+                                            Grid.Column="1"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                            <Image x:Name="PART_ImgPinMenu" Stretch="None" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu.png" Width="13"/>
+                                        </avalonDockControls:DropDownButton>
+
+                                        <Button 
+                                            x:Name="PART_PinMaximize"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            VerticalContentAlignment="Center"
+                                            HorizontalContentAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                            Grid.Column="2">
+                                            <Image x:Name="PART_ImgPinMaximize" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize.png" Width="13"/>
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinRestore"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                            CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                            Grid.Column="2">
+                                            <Image  x:Name="PART_ImgPinRestore" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore.png" Width="13"/>
+                                        </Button>
+
+                                        <Button 
+                                            x:Name="PART_PinClose"
+                                            shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource AvalonDock_ThemeVS2010_ButtonStyle}"
+                                            VerticalAlignment="Center"
+                                            HorizontalAlignment="Center"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                            Grid.Column="3">
+                                            <Image x:Name="PART_ImgPinClose" Source="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose.png" Width="13"/>
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                                <ContentPresenter
+                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                        <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=Model.SinglePane.SelectedContent.IsActive}" Value="True">
+                            <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor15}" TargetName="Header"/>
+                            <Setter Property="TextElement.Foreground" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor3}" TargetName="Header"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize_Dark.png"/>
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Dark.png"/>
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" SourceName="SinglePaneContextMenu" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsChecked" SourceName="SinglePaneContextMenu" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMenu" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMenu_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinMaximize" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinMaximize" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinMaximize_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinRestore" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinRestore" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinRestore_Black.png"/>
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" SourceName="PART_PinClose" Value="True">
+                            <Setter Property="Source" TargetName="PART_ImgPinClose" Value="/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Images/PinClose_Black.png"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource AvalonDock_ThemeVS2010_BaseColor5}"/>
+    </Style>
+
+
+    <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual">
+        <Setter Property="Control.Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Rectangle RadiusY="2" RadiusX="2" Stroke="#8E6EA6F5" StrokeThickness="1"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemHoverFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFF1FBFF" Offset="0"/>
+        <GradientStop Color="#FFD5F1FE" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFD9F4FF" Offset="0"/>
+        <GradientStop Color="#FF9BDDFB" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedInactiveFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEEEDED" Offset="0"/>
+        <GradientStop Color="#FFDDDDDD" Offset="1"/>
+    </LinearGradientBrush>
+    <LinearGradientBrush x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedHoverFill" EndPoint="0,1" StartPoint="0,0">
+        <GradientStop Color="#FFEAF9FF" Offset="0"/>
+        <GradientStop Color="#FFC9EDFD" Offset="1"/>
+    </LinearGradientBrush>
+
+    <Style x:Key="AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle" TargetType="ListBoxItem">
+        <Setter Property="FocusVisualStyle" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemFocusVisual}"/>
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="BorderBrush" Value="Transparent"/>
+        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="Padding" Value="5,0,5,0"/>
+        <Setter Property="VerticalContentAlignment" Value="Center"/>
+        <Setter Property="Cursor" Value="Hand"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}" 
+                            Background="{TemplateBinding Background}" 
+                            CornerRadius="2" SnapsToDevicePixels="true">
+                        <Border x:Name="InnerBorder" BorderThickness="1" CornerRadius="1">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition MaxHeight="11"/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Rectangle x:Name="UpperHighlight" Fill="#75FFFFFF" Visibility="Collapsed"/>
+                                <ContentPresenter Grid.RowSpan="2" 
+                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" 
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
+                            </Grid>
+                        </Border>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="true">
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}"/>
+                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="true">
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedFill}"/>
+                            <Setter Property="BorderBrush" Value="#FF98DDFB"/>
+                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
+                            <Setter Property="Visibility" TargetName="UpperHighlight" Value="Visible"/>
+                            <Setter Property="Fill" TargetName="UpperHighlight" Value="#40FFFFFF"/>
+                        </Trigger>
+                        <!--<MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsSelected" Value="true"/>
+                                <Condition Property="IsMouseOver" Value="true"/>
+                            </MultiTrigger.Conditions>
+                            <Setter Property="Background" Value="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemSelectedHoverFill}"/>
+                            <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>
+
+    <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
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    CornerRadius="3,3,3,3"
+                    GlassFrameThickness="4"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" BorderThickness="1"
+                                CornerRadius="3"
+                                Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor2}"
+                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                            <Grid>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="54"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+
+                                <Grid Margin="5">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Image 
+                                            Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}"
+                                            Stretch="None"
+                                            Visibility="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource BoolToVisibilityConverter} }"/>
+                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
+                                    </Grid>
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+                                </Grid>
+
+                                <Border Grid.Row="1" 
+                                        BorderBrush="{DynamicResource AvalonDock_ThemeVS2010_BaseColor11}"
+                                        BorderThickness="0,1,0,0"
+                                        Background="{DynamicResource AvalonDock_ThemeVS2010_BaseColor7}"
+                                        MinHeight="200" >
+                                    <Grid  Margin="5">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Grid Margin="5">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto"/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
+                                            <ListBox Grid.Row="1" 
+                                                     ItemsSource="{Binding Anchorables}"
+                                                     SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" 
+                                                     ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
+                                                     Background="Transparent" 
+                                                     BorderThickness="0"
+                                                     MaxHeight="400">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="16"/>
+                                                                <ColumnDefinition Width="150"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                                        </Grid>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                            </ListBox>
+                                        </Grid>
+                                        <Grid Grid.Column="1" Margin="5">
+                                            <Grid.RowDefinitions>
+                                                <RowDefinition Height="Auto"/>
+                                                <RowDefinition/>
+                                            </Grid.RowDefinitions>
+                                            <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
+                                            <ListBox 
+                                                Grid.Row="1" 
+                                                ItemsSource="{Binding Documents}" 
+                                                SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" 
+                                                ItemContainerStyle="{StaticResource AvalonDock_ThemeVS2010_NavigatorWindowListBoxItemStyle}"
+                                                Background="Transparent" 
+                                                BorderThickness="0" 
+                                                MaxHeight="400">
+                                                <ListBox.ItemTemplate>
+                                                    <DataTemplate>
+                                                        <Grid>
+                                                            <Grid.ColumnDefinitions>
+                                                                <ColumnDefinition Width="16"/>
+                                                                <ColumnDefinition Width="150"/>
+                                                            </Grid.ColumnDefinitions>
+                                                            <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                            <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,0,0,0"/>
+                                                        </Grid>
+                                                    </DataTemplate>
+                                                </ListBox.ItemTemplate>
+                                                <ListBox.ItemsPanel>
+                                                    <ItemsPanelTemplate>
+                                                        <WrapPanel Orientation="Vertical"/>
+                                                    </ItemsPanelTemplate>
+                                                </ListBox.ItemsPanel>
+                                            </ListBox>
+                                        </Grid>
+                                    </Grid>
+                                </Border>
+
+                                <Grid Grid.Row="2" Margin="5">
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
new file mode 100644
index 000000000..36d33474e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+    public class VS2010Theme : Theme
+    {
+        public override Uri GetResourceUri()
+        {
+            return new Uri(
+                "/Xceed.Wpf.AvalonDock.Themes.VS2010;component/Theme.xaml", 
+                UriKind.Relative);  
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj
new file mode 100644
index 000000000..9cacc0d0a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.csproj
@@ -0,0 +1,141 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.VS2010</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <Utf8Output>true</Utf8Output>
+    <ExpressionBlendVersion>4.0.20901.0</ExpressionBlendVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="VS2010Theme.cs" />
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMaximize.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinRestore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
+      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
+      <Name>Xceed.Wpf.AvalonDock</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinDocMenu_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Images\PinRestore_Black.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk
new file mode 100644
index 000000000..1bdc91203
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/sn.snk differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
new file mode 100644
index 000000000..8b8ce9d3f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfo.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
+
+internal static class _XceedVersionInfo
+{
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string BaseVersion = "2.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Version = BaseVersion + 
+  ".0.0";
+  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string PublicKeyToken = "ba83ff368b7563c6";
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfoCommon.cs
new file mode 100644
index 000000000..3316fb13a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/AssemblyVersionInfoCommon.cs
@@ -0,0 +1,22 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+internal static class _XceedVersionInfoCommon
+{
+[System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
+  public const string Build = ".*";
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
new file mode 100644
index 000000000..c82ac802b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
@@ -0,0 +1,71 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+
+namespace Xceed.Wpf.AvalonDock.Commands
+{
+    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)
+        {
+            if (execute == null)
+                throw new ArgumentNullException("execute");
+
+            _execute = execute;
+            _canExecute = canExecute;
+        }
+        #endregion // Constructors
+
+        #region ICommand Members
+
+        public bool CanExecute(object parameter)
+        {
+            return _canExecute == null ? true : _canExecute(parameter);
+        }
+
+        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/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
new file mode 100644
index 000000000..90274cc63
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class AnchorablePaneControlOverlayArea : OverlayArea
+    {
+        internal AnchorablePaneControlOverlayArea(
+            IOverlayWindow overlayWindow, 
+            LayoutAnchorablePaneControl anchorablePaneControl)
+            : base(overlayWindow)
+        {
+
+            _anchorablePaneControl = anchorablePaneControl;
+            base.SetScreenDetectionArea(new Rect(
+                _anchorablePaneControl.PointToScreenDPI(new Point()),
+                _anchorablePaneControl.TransformActualSizeToAncestor()));
+
+        }
+
+        LayoutAnchorablePaneControl _anchorablePaneControl;
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
new file mode 100644
index 000000000..a17a47c42
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
@@ -0,0 +1,336 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal class AnchorablePaneDropTarget : DropTarget<LayoutAnchorablePaneControl>
+    {
+        internal AnchorablePaneDropTarget(LayoutAnchorablePaneControl paneControl, Rect detectionRect, DropTargetType type)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+        }
+
+        internal AnchorablePaneDropTarget(LayoutAnchorablePaneControl paneControl, Rect detectionRect, DropTargetType type, int tabIndex)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+            _tabIndex = tabIndex;
+        }
+
+
+        LayoutAnchorablePaneControl _targetPane;
+
+        int _tabIndex = -1;
+
+        protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        {
+            ILayoutAnchorablePane targetModel = _targetPane.Model as ILayoutAnchorablePane;
+            LayoutAnchorable anchorableActive = floatingWindow.Descendents().OfType<LayoutAnchorable>().FirstOrDefault();
+
+            switch (Type)
+            {
+                case DropTargetType.AnchorablePaneDockBottom:
+                    #region DropTargetType.AnchorablePaneDockBottom
+                    {
+                        var parentModel = targetModel.Parent as ILayoutGroup;
+                        var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+                        int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+                        if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+                            parentModel.ChildrenCount == 1)
+                            parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                (layoutAnchorablePaneGroup.Children.Count == 1 ||
+                                    layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+                            {
+                                var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < anchorablesToMove.Length; i++)
+                                    parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+                            }
+                            else
+                                parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+                            var newOrientedPanel = new LayoutAnchorablePaneGroup()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Vertical,
+                                DockWidth = targetModelAsPositionableElement.DockWidth,
+                                DockHeight = targetModelAsPositionableElement.DockHeight,
+                            };
+
+                            parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+                            newOrientedPanel.Children.Add(targetModel);
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.AnchorablePaneDockTop:
+                    #region DropTargetType.AnchorablePaneDockTop
+                    {
+                        var parentModel = targetModel.Parent as ILayoutGroup;
+                        var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+                        int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+                        if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Vertical &&
+                            parentModel.ChildrenCount == 1)
+                            parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                (layoutAnchorablePaneGroup.Children.Count == 1 ||
+                                    layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical))
+                            {
+                                var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < anchorablesToMove.Length; i++)
+                                    parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+                            }
+                            else
+                                parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+                            var newOrientedPanel = new LayoutAnchorablePaneGroup()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Vertical,
+                                DockWidth = targetModelAsPositionableElement.DockWidth,
+                                DockHeight = targetModelAsPositionableElement.DockHeight,
+                            };
+
+                            parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+                            //the floating window must be added after the target modal as it could be raise a CollectGarbage call
+                            newOrientedPanel.Children.Add(targetModel);
+                            newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.AnchorablePaneDockLeft:
+                    #region DropTargetType.AnchorablePaneDockLeft
+                    {
+                        var parentModel = targetModel.Parent as ILayoutGroup;
+                        var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+                        int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+                        if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+                            parentModel.ChildrenCount == 1)
+                            parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                (layoutAnchorablePaneGroup.Children.Count == 1 ||
+                                    layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+                            {
+                                var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < anchorablesToMove.Length; i++)
+                                    parentModel.InsertChildAt(insertToIndex + i, anchorablesToMove[i]);
+                            }
+                            else
+                                parentModel.InsertChildAt(insertToIndex, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+                            var newOrientedPanel = new LayoutAnchorablePaneGroup()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Horizontal,
+                                DockWidth = targetModelAsPositionableElement.DockWidth,
+                                DockHeight = targetModelAsPositionableElement.DockHeight,
+                            };
+
+                            parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+                            //the floating window must be added after the target modal as it could be raise a CollectGarbage call
+                            newOrientedPanel.Children.Add(targetModel);
+                            newOrientedPanel.Children.Insert(0, floatingWindow.RootPanel);
+
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.AnchorablePaneDockRight:
+                    #region DropTargetType.AnchorablePaneDockRight
+                    {
+                        var parentModel = targetModel.Parent as ILayoutGroup;
+                        var parentModelOrientable = targetModel.Parent as ILayoutOrientableGroup;
+                        int insertToIndex = parentModel.IndexOfChild(targetModel);
+
+                        if (parentModelOrientable.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+                            parentModel.ChildrenCount == 1)
+                            parentModelOrientable.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (parentModelOrientable.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                (layoutAnchorablePaneGroup.Children.Count == 1 ||
+                                    layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal))
+                            {
+                                var anchorablesToMove = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < anchorablesToMove.Length; i++)
+                                    parentModel.InsertChildAt(insertToIndex + 1 + i, anchorablesToMove[i]);
+                            }
+                            else
+                                parentModel.InsertChildAt(insertToIndex + 1, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var targetModelAsPositionableElement = targetModel as ILayoutPositionableElement;
+                            var newOrientedPanel = new LayoutAnchorablePaneGroup()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Horizontal,
+                                DockWidth = targetModelAsPositionableElement.DockWidth,
+                                DockHeight = targetModelAsPositionableElement.DockHeight,
+                            };
+
+                            parentModel.InsertChildAt(insertToIndex, newOrientedPanel);
+                            newOrientedPanel.Children.Add(targetModel);
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+
+                        }
+                    }
+                    break;
+                    #endregion
+
+
+                case DropTargetType.AnchorablePaneDockInside:
+                    #region DropTargetType.AnchorablePaneDockInside
+                    {
+                        var paneModel = targetModel as LayoutAnchorablePane;
+                        var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+                        int i = _tabIndex == -1 ? 0 : _tabIndex;
+                        foreach (var anchorableToImport in 
+                            layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+                        {
+                            paneModel.Children.Insert(i, anchorableToImport);
+                            i++;
+                        }
+
+                    }
+                    break;
+                    #endregion
+
+
+            }
+
+            anchorableActive.IsActive = true;
+
+            base.Drop(floatingWindow);
+        }
+
+        public override System.Windows.Media.Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindowModel)
+        {
+            //var anchorablePaneDropTarget = target as AnchorablePaneDropTarget;
+            var anchorableFloatingWindowModel = floatingWindowModel as LayoutAnchorableFloatingWindow;
+            var layoutAnchorablePane = anchorableFloatingWindowModel.RootPanel as ILayoutPositionableElement;
+            var layoutAnchorablePaneWithActualSize = anchorableFloatingWindowModel.RootPanel as ILayoutPositionableElementWithActualSize;
+
+            switch (Type)
+            {
+                case DropTargetType.AnchorablePaneDockBottom:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
+                        targetScreenRect.Height /= 2.0;
+
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.AnchorablePaneDockTop:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        targetScreenRect.Height /= 2.0;
+
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.AnchorablePaneDockLeft:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        targetScreenRect.Width /= 2.0;
+
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.AnchorablePaneDockRight:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
+                        targetScreenRect.Width /= 2.0;
+
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.AnchorablePaneDockInside:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        if (_tabIndex == -1)
+                        {
+                            return new RectangleGeometry(targetScreenRect);
+                        }
+                        else
+                        {
+                            var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
+                            translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                            var pathFigure = new PathFigure();
+                            pathFigure.StartPoint = targetScreenRect.TopLeft;
+                            pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Top) });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
+                            pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Top) });
+                            pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.TopRight });
+                            pathFigure.IsClosed = true;
+                            pathFigure.IsFilled = true;
+                            pathFigure.Freeze();
+                            return new PathGeometry(new PathFigure[] { pathFigure });
+                        }
+                    }
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
new file mode 100644
index 000000000..c4c4787ea
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
@@ -0,0 +1,107 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class AnchorablePaneTabPanel : Panel
+    {
+        public AnchorablePaneTabPanel()
+        {
+            FlowDirection = System.Windows.FlowDirection.LeftToRight;
+        }
+
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            double totWidth = 0;
+            double maxHeight = 0;
+            var visibleChildren = Children.Cast<UIElement>().Where(ch => ch.Visibility != System.Windows.Visibility.Collapsed);
+            foreach (FrameworkElement child in visibleChildren)
+            {
+                child.Measure(new Size(double.PositiveInfinity, availableSize.Height));
+                totWidth += child.DesiredSize.Width;
+                maxHeight = Math.Max(maxHeight, child.DesiredSize.Height);
+            }
+
+            if (totWidth > availableSize.Width)
+            {
+                double childFinalDesideredWidth = availableSize.Width / visibleChildren.Count();
+                foreach (FrameworkElement child in visibleChildren)
+                {
+                    child.Measure(new Size(childFinalDesideredWidth, availableSize.Height));
+                }
+            }
+
+            return new Size(Math.Min(availableSize.Width, totWidth), maxHeight);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            var visibleChildren = Children.Cast<UIElement>().Where(ch => ch.Visibility != System.Windows.Visibility.Collapsed);
+
+
+            double finalWidth = finalSize.Width;
+            double desideredWidth = visibleChildren.Sum(ch => ch.DesiredSize.Width);
+            double offsetX = 0.0;
+
+            if (finalWidth > desideredWidth)
+            {
+                foreach (FrameworkElement child in visibleChildren)
+                {
+                    double childFinalWidth = child.DesiredSize.Width ;
+                    child.Arrange(new Rect(offsetX, 0, childFinalWidth, finalSize.Height));
+
+                    offsetX += childFinalWidth;
+                }
+            }
+            else
+            {
+                double childFinalWidth = finalWidth / visibleChildren.Count();
+                foreach (FrameworkElement child in visibleChildren)
+                {
+                    child.Arrange(new Rect(offsetX, 0, childFinalWidth, finalSize.Height));
+
+                    offsetX += childFinalWidth;
+                }   
+            }
+
+            return finalSize;
+        }
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            if (e.LeftButton == System.Windows.Input.MouseButtonState.Pressed &&
+                LayoutAnchorableTabItem.IsDraggingItem())
+            {
+                var contentModel = LayoutAnchorableTabItem.GetDraggingItem().Model as LayoutAnchorable;
+                var manager = contentModel.Root.Manager;
+                LayoutAnchorableTabItem.ResetDraggingItem();
+
+                manager.StartDraggingFloatingWindowForContent(contentModel);
+            }
+
+            base.OnMouseLeave(e);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
new file mode 100644
index 000000000..bf11271b6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
@@ -0,0 +1,189 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+
+    public class AnchorablePaneTitle : Control
+    {
+        static AnchorablePaneTitle()
+        {
+            IsHitTestVisibleProperty.OverrideMetadata(typeof(AnchorablePaneTitle), new FrameworkPropertyMetadata(true));
+            FocusableProperty.OverrideMetadata(typeof(AnchorablePaneTitle), new FrameworkPropertyMetadata(false));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(AnchorablePaneTitle), new FrameworkPropertyMetadata(typeof(AnchorablePaneTitle)));
+        }
+
+
+        public AnchorablePaneTitle()
+        { 
+
+        }
+
+        #region Model
+
+        /// <summary>
+        /// Model Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ModelProperty =
+            DependencyProperty.Register("Model", typeof(LayoutAnchorable), typeof(AnchorablePaneTitle),
+                new FrameworkPropertyMetadata((LayoutAnchorable)null, new PropertyChangedCallback(_OnModelChanged)));
+
+        /// <summary>
+        /// Gets or sets the Model property.  This dependency property 
+        /// indicates model attached to this view.
+        /// </summary>
+        public LayoutAnchorable Model
+        {
+            get { return (LayoutAnchorable)GetValue(ModelProperty); }
+            set { SetValue(ModelProperty, value); }
+        }
+
+        static void _OnModelChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            ((AnchorablePaneTitle)sender).OnModelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Model property.
+        /// </summary>
+        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (Model != null)
+                SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+            else
+                SetLayoutItem(null);
+        }
+
+        #endregion
+
+
+        #region LayoutItem
+
+        /// <summary>
+        /// LayoutItem Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey LayoutItemPropertyKey
+            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(AnchorablePaneTitle),
+                new FrameworkPropertyMetadata((LayoutItem)null));
+
+        public static readonly DependencyProperty LayoutItemProperty
+            = LayoutItemPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the LayoutItem property.  This dependency property 
+        /// indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        public LayoutItem LayoutItem
+        {
+            get { return (LayoutItem)GetValue(LayoutItemProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the LayoutItem property.  
+        /// This dependency property indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetLayoutItem(LayoutItem value)
+        {
+            SetValue(LayoutItemPropertyKey, value);
+        }
+
+        #endregion
+
+
+        private void OnHide()
+        {
+            Model.Hide();
+        }
+
+        private void OnToggleAutoHide()
+        {
+            Model.ToggleAutoHide();
+        }
+
+        protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
+        {
+            if (e.LeftButton != MouseButtonState.Pressed)
+            {
+                _isMouseDown = false;
+            }
+
+            base.OnMouseMove(e);
+        }
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            if (_isMouseDown && e.LeftButton == MouseButtonState.Pressed)
+            {
+                var pane = this.FindVisualAncestor<LayoutAnchorablePaneControl>();
+                if (pane != null)
+                {
+                    var paneModel = pane.Model as LayoutAnchorablePane;
+                    var manager = paneModel.Root.Manager;
+
+                    manager.StartDraggingFloatingWindowForPane(paneModel);
+                }
+            }
+
+            _isMouseDown = false;
+        }
+
+        bool _isMouseDown = false;
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            if (!e.Handled)
+            {
+                bool attachFloatingWindow = false;
+                var parentFloatingWindow = Model.FindParent<LayoutAnchorableFloatingWindow>();
+                if (parentFloatingWindow != null)
+                {
+                    attachFloatingWindow = parentFloatingWindow.Descendents().OfType<LayoutAnchorablePane>().Count() == 1;
+                }
+
+                if (attachFloatingWindow)
+                {
+                    //the pane is hosted inside a floating window that contains only an anchorable pane so drag the floating window itself
+                    var floatingWndControl = Model.Root.Manager.FloatingWindows.Single(fwc => fwc.Model == parentFloatingWindow);
+                    floatingWndControl.AttachDrag(false);
+                }
+                else
+                    _isMouseDown = true;//normal drag
+            }
+        }
+
+        protected override void OnMouseLeftButtonUp(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            _isMouseDown = false;
+            base.OnMouseLeftButtonUp(e);
+
+            if (Model != null)
+                Model.IsActive = true;//FocusElementManager.SetFocusOnLastElement(Model);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
new file mode 100644
index 000000000..b4fc842cb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
@@ -0,0 +1,86 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Threading;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class AutoHideWindowManager
+    {
+        DockingManager _manager;
+
+        internal AutoHideWindowManager(DockingManager manager)
+        {
+            _manager = manager;
+            SetupCloseTimer();
+        }
+
+
+        WeakReference _currentAutohiddenAnchor = null;
+
+        public void ShowAutoHideWindow(LayoutAnchorControl anchor)
+        {
+            StopCloseTimer();
+            _currentAutohiddenAnchor = new WeakReference(anchor);
+            _manager.AutoHideWindow.Show(anchor);
+            StartCloseTimer();
+        }
+
+        public void HideAutoWindow(LayoutAnchorControl anchor = null)
+        {
+            if (anchor == null ||
+                anchor == _currentAutohiddenAnchor.GetValueOrDefault<LayoutAnchorControl>())
+            {
+                StopCloseTimer();
+            }
+            else
+                System.Diagnostics.Debug.Assert(false);
+        }
+
+        DispatcherTimer _closeTimer = null;
+        void SetupCloseTimer()
+        {
+            _closeTimer = new DispatcherTimer(DispatcherPriority.Background);
+            _closeTimer.Interval = TimeSpan.FromMilliseconds(1500);
+            _closeTimer.Tick += (s, e) =>
+            {
+                if (_manager.AutoHideWindow.IsWin32MouseOver ||
+                    ((LayoutAnchorable)_manager.AutoHideWindow.Model).IsActive ||
+                    _manager.AutoHideWindow.IsResizing)
+                    return;
+
+                StopCloseTimer();
+            };
+        }
+
+        void StartCloseTimer()
+        { 
+            _closeTimer.Start();
+
+        }
+
+        void StopCloseTimer()
+        {
+            _closeTimer.Stop();
+            _manager.AutoHideWindow.Hide();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
new file mode 100644
index 000000000..e04049e19
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
@@ -0,0 +1,55 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.ComponentModel;
+using System.Windows.Data;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class BindingHelper
+    {
+        public static void RebindInactiveBindings(DependencyObject dependencyObject)
+        {
+            foreach (PropertyDescriptor property in TypeDescriptor.GetProperties(dependencyObject.GetType()))
+            {
+                var dpd = DependencyPropertyDescriptor.FromProperty(property);
+                if (dpd != null)
+                {
+                    BindingExpressionBase binding = BindingOperations.GetBindingExpressionBase(dependencyObject, dpd.DependencyProperty);
+                    if (binding != null)
+                    {
+                        //if (property.Name == "DataContext" || binding.HasError || binding.Status != BindingStatus.Active)
+                        {
+                            // Ensure that no pending calls are in the dispatcher queue
+                            Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.SystemIdle, (Action)delegate
+                            {
+                                // Remove and add the binding to re-trigger the binding error
+                                dependencyObject.ClearValue(dpd.DependencyProperty);
+                                BindingOperations.SetBinding(dependencyObject, dpd.DependencyProperty, binding.ParentBindingBase);
+                            });
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
new file mode 100644
index 000000000..3bffa6021
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class ContextMenuEx : ContextMenu
+    {
+        static ContextMenuEx()
+        {
+        }
+
+        public ContextMenuEx()
+        {
+
+        }
+
+        protected override System.Windows.DependencyObject GetContainerForItemOverride()
+        {
+            return new MenuItemEx();
+        }
+
+        protected override void OnOpened(System.Windows.RoutedEventArgs e)
+        {
+            BindingOperations.GetBindingExpression(this, ItemsSourceProperty).UpdateTarget();
+
+            base.OnOpened(e);
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
new file mode 100644
index 000000000..ab773a3f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
@@ -0,0 +1,248 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal class DockingManagerDropTarget : DropTarget<DockingManager>
+    {
+        internal DockingManagerDropTarget(DockingManager manager, Rect detectionRect, DropTargetType type)
+            : base(manager, detectionRect, type)
+        {
+            _manager = manager;
+        }
+
+        DockingManager _manager;
+
+        protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        {
+            switch (Type)
+            {
+                case DropTargetType.DockingManagerDockLeft:
+                    #region DropTargetType.DockingManagerDockLeft
+                    {
+                        if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+                            _manager.Layout.RootPanel.Children.Count == 1)
+                            _manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < childrenToTransfer.Length; i++)
+                                    _manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+                            }
+                            else
+                                _manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var newOrientedPanel = new LayoutPanel()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Horizontal
+                            };
+
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+                            newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+
+                            _manager.Layout.RootPanel = newOrientedPanel;
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DockingManagerDockRight:
+                    #region DropTargetType.DockingManagerDockRight
+                    {
+                        if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Horizontal &&
+                            _manager.Layout.RootPanel.Children.Count == 1)
+                            _manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < childrenToTransfer.Length; i++)
+                                    _manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+                            }
+                            else
+                                _manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var newOrientedPanel = new LayoutPanel()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Horizontal
+                            };
+
+                            newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+
+                            _manager.Layout.RootPanel = newOrientedPanel;
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DockingManagerDockTop:
+                    #region DropTargetType.DockingManagerDockTop
+                    {
+                        if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
+                            _manager.Layout.RootPanel.Children.Count == 1)
+                            _manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < childrenToTransfer.Length; i++)
+                                    _manager.Layout.RootPanel.Children.Insert(i, childrenToTransfer[i]);
+                            }
+                            else
+                                _manager.Layout.RootPanel.Children.Insert(0, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var newOrientedPanel = new LayoutPanel()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Vertical
+                            };
+
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+                            newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+
+                            _manager.Layout.RootPanel = newOrientedPanel;
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DockingManagerDockBottom:
+                    #region DropTargetType.DockingManagerDockBottom
+                    {
+                        if (_manager.Layout.RootPanel.Orientation != System.Windows.Controls.Orientation.Vertical &&
+                            _manager.Layout.RootPanel.Children.Count == 1)
+                            _manager.Layout.RootPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (_manager.Layout.RootPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+                            if (layoutAnchorablePaneGroup != null &&
+                                layoutAnchorablePaneGroup.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                var childrenToTransfer = layoutAnchorablePaneGroup.Children.ToArray();
+                                for (int i = 0; i < childrenToTransfer.Length; i++)
+                                    _manager.Layout.RootPanel.Children.Add(childrenToTransfer[i]);
+
+                            }
+                            else
+                                _manager.Layout.RootPanel.Children.Add(floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            var newOrientedPanel = new LayoutPanel()
+                            {
+                                Orientation = System.Windows.Controls.Orientation.Vertical
+                            };
+
+                            newOrientedPanel.Children.Add(_manager.Layout.RootPanel);
+                            newOrientedPanel.Children.Add(floatingWindow.RootPanel);
+
+                            _manager.Layout.RootPanel = newOrientedPanel;
+                        }
+                    }
+                    break;
+                    #endregion
+            }
+
+
+            base.Drop(floatingWindow);
+        }
+
+        public override System.Windows.Media.Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindowModel)
+        {
+            var anchorableFloatingWindowModel = floatingWindowModel as LayoutAnchorableFloatingWindow;
+            var layoutAnchorablePane = anchorableFloatingWindowModel.RootPanel as ILayoutPositionableElement;
+            var layoutAnchorablePaneWithActualSize = anchorableFloatingWindowModel.RootPanel as ILayoutPositionableElementWithActualSize;
+
+            var targetScreenRect = TargetElement.GetScreenArea();
+
+            switch (Type)
+            {
+                case DropTargetType.DockingManagerDockLeft:
+                    {
+                        var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
+                        var previewBoxRect = new Rect(
+                            targetScreenRect.Left - overlayWindow.Left,
+                            targetScreenRect.Top - overlayWindow.Top,
+                            Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+                            targetScreenRect.Height);
+
+                        return new RectangleGeometry(previewBoxRect);
+                    }
+                case DropTargetType.DockingManagerDockTop:
+                    {
+                        var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
+                        var previewBoxRect = new Rect(
+                            targetScreenRect.Left - overlayWindow.Left,
+                            targetScreenRect.Top - overlayWindow.Top,
+                            targetScreenRect.Width,
+                            Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
+
+                        return new RectangleGeometry(previewBoxRect);
+                    }
+                case DropTargetType.DockingManagerDockRight:
+                    {
+                        var desideredWidth = layoutAnchorablePane.DockWidth.IsAbsolute ? layoutAnchorablePane.DockWidth.Value : layoutAnchorablePaneWithActualSize.ActualWidth;
+                        var previewBoxRect = new Rect(
+                            targetScreenRect.Right - overlayWindow.Left - Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+                            targetScreenRect.Top - overlayWindow.Top,
+                            Math.Min(desideredWidth, targetScreenRect.Width / 2.0),
+                            targetScreenRect.Height);
+
+                        return new RectangleGeometry(previewBoxRect);
+                    }
+                case DropTargetType.DockingManagerDockBottom:
+                    {
+                        var desideredHeight = layoutAnchorablePane.DockHeight.IsAbsolute ? layoutAnchorablePane.DockHeight.Value : layoutAnchorablePaneWithActualSize.ActualHeight;
+                        var previewBoxRect = new Rect(
+                            targetScreenRect.Left - overlayWindow.Left,
+                            targetScreenRect.Bottom - overlayWindow.Top - Math.Min(desideredHeight, targetScreenRect.Height / 2.0),
+                            targetScreenRect.Width,
+                            Math.Min(desideredHeight, targetScreenRect.Height / 2.0));
+
+                        return new RectangleGeometry(previewBoxRect);
+                    }
+            }
+
+
+            throw new InvalidOperationException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
new file mode 100644
index 000000000..0192c7fe7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
@@ -0,0 +1,40 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class DockingManagerOverlayArea : OverlayArea
+    {
+        internal DockingManagerOverlayArea(IOverlayWindow overlayWindow, DockingManager manager)
+            : base(overlayWindow)
+        {
+            _manager = manager;
+
+            base.SetScreenDetectionArea(new Rect(
+                _manager.PointToScreenDPI(new Point()),
+                _manager.TransformActualSizeToAncestor()));
+        }
+
+        DockingManager _manager;
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
new file mode 100644
index 000000000..0069ae84d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
@@ -0,0 +1,44 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class DocumentPaneControlOverlayArea : OverlayArea
+    {
+
+
+        internal DocumentPaneControlOverlayArea(
+            IOverlayWindow overlayWindow,
+            LayoutDocumentPaneControl documentPaneControl)
+            : base(overlayWindow)
+        {
+            _documentPaneControl = documentPaneControl;
+            base.SetScreenDetectionArea(new Rect(
+                _documentPaneControl.PointToScreenDPI(new Point()),
+                _documentPaneControl.TransformActualSizeToAncestor()));
+        }
+
+        LayoutDocumentPaneControl _documentPaneControl;
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
new file mode 100644
index 000000000..fbe700c76
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
@@ -0,0 +1,277 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal class DocumentPaneDropAsAnchorableTarget : DropTarget<LayoutDocumentPaneControl>
+    {
+        internal DocumentPaneDropAsAnchorableTarget(LayoutDocumentPaneControl paneControl, Rect detectionRect, DropTargetType type)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+        }
+
+        internal DocumentPaneDropAsAnchorableTarget(LayoutDocumentPaneControl paneControl, Rect detectionRect, DropTargetType type, int tabIndex)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+            _tabIndex = tabIndex;
+        }
+
+
+        LayoutDocumentPaneControl _targetPane;
+
+        int _tabIndex = -1;
+
+        protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        {
+            ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
+            LayoutDocumentPaneGroup parentGroup;
+            LayoutPanel parentGroupPanel;
+            FindParentLayoutDocumentPane(targetModel, out parentGroup, out parentGroupPanel);
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneDockAsAnchorableBottom:
+                    #region DropTargetType.DocumentPaneDockAsAnchorableBottom
+                    {
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.ChildrenCount == 1)
+                            parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            parentGroupPanel.Children.Insert(
+                                parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
+                                floatingWindow.RootPanel);
+                        }
+                        else if (parentGroupPanel != null)
+                        {
+                            var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                            parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+                            newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+                            newParentPanel.Children.Add(floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            throw new NotImplementedException();
+                        }
+
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockAsAnchorableTop:
+                    #region DropTargetType.DocumentPaneDockAsAnchorableTop
+                    {
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.ChildrenCount == 1)
+                            parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Vertical;
+
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                        {
+                            parentGroupPanel.Children.Insert(
+                                parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
+                                floatingWindow.RootPanel);
+                        }
+                        else if (parentGroupPanel != null)
+                        {
+                            var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                            parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+                            newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+                            newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            throw new NotImplementedException();
+                        }
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockAsAnchorableLeft:
+                    #region DropTargetType.DocumentPaneDockAsAnchorableLeft
+                    {
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.ChildrenCount == 1)
+                            parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            parentGroupPanel.Children.Insert(
+                                parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel),
+                                floatingWindow.RootPanel);
+                        }
+                        else if (parentGroupPanel != null)
+                        {
+                            var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+                            newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+                            newParentPanel.Children.Insert(0, floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            throw new NotImplementedException();
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockAsAnchorableRight:
+                    #region DropTargetType.DocumentPaneDockAsAnchorableRight
+                    {
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.ChildrenCount == 1)
+                            parentGroupPanel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+
+                        if (parentGroupPanel != null &&
+                            parentGroupPanel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                        {
+                            parentGroupPanel.Children.Insert(
+                                parentGroupPanel.IndexOfChild(parentGroup != null ? parentGroup : targetModel) + 1,
+                                floatingWindow.RootPanel);
+                        }
+                        else if (parentGroupPanel != null)
+                        {
+                            var newParentPanel = new LayoutPanel() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentGroupPanel.ReplaceChild(parentGroup != null ? parentGroup : targetModel, newParentPanel);
+                            newParentPanel.Children.Add(parentGroup != null ? parentGroup : targetModel);
+                            newParentPanel.Children.Add(floatingWindow.RootPanel);
+                        }
+                        else
+                        {
+                            throw new NotImplementedException();
+                        }
+                    }
+                    break;
+                    #endregion
+            }
+
+            base.Drop(floatingWindow);
+        }
+
+        public override System.Windows.Media.Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindowModel)
+        {
+            Rect targetScreenRect;
+            ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
+            var manager = targetModel.Root.Manager;
+
+            //ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
+            LayoutDocumentPaneGroup parentGroup;
+            LayoutPanel parentGroupPanel;
+            if (!FindParentLayoutDocumentPane(targetModel, out parentGroup, out parentGroupPanel))
+                return null;
+
+            //if (targetModel.Parent is LayoutDocumentPaneGroup)
+            //{
+            //    var parentGroup = targetModel.Parent as LayoutDocumentPaneGroup;
+            //    var documentPaneGroupControl = manager.FindLogicalChildren<LayoutDocumentPaneGroupControl>().First(d => d.Model == parentGroup);
+            //    targetScreenRect = documentPaneGroupControl.GetScreenArea();
+            //}
+            //else
+            //{
+            //    var documentPaneControl = manager.FindLogicalChildren<LayoutDocumentPaneControl>().First(d => d.Model == targetModel);
+            //    targetScreenRect = documentPaneControl.GetScreenArea();
+            //}
+
+            //var parentPanel = targetModel.FindParent<LayoutPanel>();
+            var documentPaneControl = manager.FindLogicalChildren<FrameworkElement>().OfType<ILayoutControl>().First(d => parentGroup != null ? d.Model == parentGroup : d.Model == parentGroupPanel) as FrameworkElement;
+            targetScreenRect = documentPaneControl.GetScreenArea();
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneDockAsAnchorableBottom:
+                    {
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Offset(0.0, targetScreenRect.Height - targetScreenRect.Height / 3.0);
+                        targetScreenRect.Height /= 3.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockAsAnchorableTop:
+                    {
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Height /= 3.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockAsAnchorableRight:
+                    {
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Offset(targetScreenRect.Width - targetScreenRect.Width / 3.0, 0.0);
+                        targetScreenRect.Width /= 3.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockAsAnchorableLeft:
+                    {
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Width /= 3.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+            }
+
+            return null;
+        }
+
+
+
+        bool FindParentLayoutDocumentPane(ILayoutDocumentPane documentPane, out LayoutDocumentPaneGroup containerPaneGroup, out LayoutPanel containerPanel)
+        {
+            containerPaneGroup = null;
+            containerPanel = null;
+
+            if (documentPane.Parent is LayoutPanel)
+            {
+                containerPaneGroup = null;
+                containerPanel = documentPane.Parent as LayoutPanel;
+                return true;
+            }
+            else if (documentPane.Parent is LayoutDocumentPaneGroup)
+            {
+                var currentDocumentPaneGroup = documentPane.Parent as LayoutDocumentPaneGroup;
+                while (!(currentDocumentPaneGroup.Parent is LayoutPanel))
+                {
+                    currentDocumentPaneGroup = currentDocumentPaneGroup.Parent as LayoutDocumentPaneGroup;
+
+                    if (currentDocumentPaneGroup == null)
+                        break;
+                }
+
+                if (currentDocumentPaneGroup == null)
+                    return false;
+
+                containerPaneGroup = currentDocumentPaneGroup;
+                containerPanel = currentDocumentPaneGroup.Parent as LayoutPanel;
+                return true;
+            }
+
+            return false;
+
+
+
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
new file mode 100644
index 000000000..5fce23d0a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
@@ -0,0 +1,474 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal class DocumentPaneDropTarget : DropTarget<LayoutDocumentPaneControl>
+    {
+        internal DocumentPaneDropTarget(LayoutDocumentPaneControl paneControl, Rect detectionRect, DropTargetType type)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+        }
+
+        internal DocumentPaneDropTarget(LayoutDocumentPaneControl paneControl, Rect detectionRect, DropTargetType type, int tabIndex)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+            _tabIndex = tabIndex;
+        }
+
+
+        LayoutDocumentPaneControl _targetPane;
+
+        int _tabIndex = -1;
+
+        protected override void Drop(LayoutDocumentFloatingWindow floatingWindow)
+        {
+            ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneDockBottom:
+                    #region DropTargetType.DocumentPaneDockBottom
+                    {
+                        var newLayoutDocumentPane = new LayoutDocumentPane(floatingWindow.RootDocument);
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical};
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(targetModel);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                            }
+
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockTop:
+                    #region DropTargetType.DocumentPaneDockTop
+                    {
+                        var newLayoutDocumentPane = new LayoutDocumentPane(floatingWindow.RootDocument);
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                            newParentModel.Children.Insert(0, newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                                newChildGroup.Children.Add(targetModel);
+                            }
+
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockLeft:
+                    #region DropTargetType.DocumentPaneDockLeft
+                    {
+                        var newLayoutDocumentPane = new LayoutDocumentPane(floatingWindow.RootDocument);
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel);
+                            newParentModel.Children.Insert(0, newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                                newChildGroup.Children.Add(targetModel);
+                            }
+                        }
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockRight:
+                    #region DropTargetType.DocumentPaneDockRight
+                    {
+                        var newLayoutDocumentPane = new LayoutDocumentPane(floatingWindow.RootDocument);
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(targetModel);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                            }
+
+                        }
+                    }
+                    break;
+                    #endregion
+
+                case DropTargetType.DocumentPaneDockInside:
+                    #region DropTargetType.DocumentPaneDockInside
+                    {
+                        var paneModel = targetModel as LayoutDocumentPane;
+                        var sourceModel = floatingWindow.RootDocument;
+
+                        int i = _tabIndex == -1 ? 0 : _tabIndex;
+                        sourceModel.IsActive = false;
+                        paneModel.Children.Insert(i, sourceModel);
+                        sourceModel.IsActive = true;
+                    }
+                    break;
+                    #endregion
+
+
+            }
+
+            base.Drop(floatingWindow);
+        }
+
+        protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        {
+            ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneDockBottom:
+                    #region DropTargetType.DocumentPaneDockBottom
+                    {
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+                        var newLayoutDocumentPane = new LayoutDocumentPane();
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(targetModel);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                            }
+                        }
+
+                        foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+                            newLayoutDocumentPane.Children.Add(cntToTransfer);
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockTop:
+                    #region DropTargetType.DocumentPaneDockTop
+                    {
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+                        var newLayoutDocumentPane = new LayoutDocumentPane();
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Vertical)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                                newChildGroup.Children.Add(targetModel);
+                            }
+                        }
+
+                        foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+                            newLayoutDocumentPane.Children.Add(cntToTransfer);
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockLeft:
+                    #region DropTargetType.DocumentPaneDockLeft
+                    {
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+                        var newLayoutDocumentPane = new LayoutDocumentPane();
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                                newChildGroup.Children.Add(targetModel);
+                            }
+
+                        }
+
+                        foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+                            newLayoutDocumentPane.Children.Add(cntToTransfer);
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockRight:
+                    #region DropTargetType.DocumentPaneDockRight
+                    {
+                        var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
+                        var newLayoutDocumentPane = new LayoutDocumentPane();
+
+                        if (parentModel == null)
+                        {
+                            var parentContainer = targetModel.Parent as ILayoutContainer;
+                            var newParentModel = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                            parentContainer.ReplaceChild(targetModel, newParentModel);
+                            newParentModel.Children.Add(targetModel as LayoutDocumentPane);
+                            newParentModel.Children.Add(newLayoutDocumentPane);
+                        }
+                        else
+                        {
+                            var manager = parentModel.Root.Manager;
+                            if (!manager.AllowMixedOrientation || parentModel.Orientation == System.Windows.Controls.Orientation.Horizontal)
+                            {
+                                parentModel.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                int targetPaneIndex = parentModel.IndexOfChild(targetModel);
+                                parentModel.Children.Insert(targetPaneIndex + 1, newLayoutDocumentPane);
+                            }
+                            else
+                            {
+                                LayoutDocumentPaneGroup newChildGroup = new LayoutDocumentPaneGroup();
+                                newChildGroup.Orientation = System.Windows.Controls.Orientation.Horizontal;
+                                parentModel.ReplaceChild(targetModel, newChildGroup);
+                                newChildGroup.Children.Add(targetModel);
+                                newChildGroup.Children.Add(newLayoutDocumentPane);
+                            }
+                        }
+
+                        foreach (var cntToTransfer in floatingWindow.RootPanel.Descendents().OfType<LayoutAnchorable>().ToArray())
+                            newLayoutDocumentPane.Children.Add(cntToTransfer);
+
+                    }
+                    break;
+                    #endregion
+                case DropTargetType.DocumentPaneDockInside:
+                    #region DropTargetType.DocumentPaneDockInside
+                    {
+                        var paneModel = targetModel as LayoutDocumentPane;
+                        var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+                        int i = _tabIndex == -1 ? 0 : _tabIndex;
+                        LayoutAnchorable anchorableToActivate = null;
+                        foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+                        {
+                            paneModel.Children.Insert(i, anchorableToImport);
+                            i++;
+                            anchorableToActivate = anchorableToImport;
+                        }
+
+                        anchorableToActivate.IsActive = true;
+                    }
+                    break;
+                    #endregion
+            }
+
+            base.Drop(floatingWindow);
+        }
+
+        public override System.Windows.Media.Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindowModel)
+        {
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneDockInside:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        if (_tabIndex == -1)
+                        {
+                            return new RectangleGeometry(targetScreenRect);
+                        }
+                        else
+                        {
+                            var translatedDetectionRect = new Rect(DetectionRects[0].TopLeft, DetectionRects[0].BottomRight);
+                            translatedDetectionRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                            var pathFigure = new PathFigure();
+                            pathFigure.StartPoint = targetScreenRect.BottomRight;
+                            pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Right, translatedDetectionRect.Bottom) });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomRight });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopRight });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.TopLeft });
+                            pathFigure.Segments.Add(new LineSegment() { Point = translatedDetectionRect.BottomLeft });
+                            pathFigure.Segments.Add(new LineSegment() { Point = new Point(targetScreenRect.Left, translatedDetectionRect.Bottom) });
+                            pathFigure.Segments.Add(new LineSegment() { Point = targetScreenRect.BottomLeft });
+                            pathFigure.IsClosed = true;
+                            pathFigure.IsFilled = true;
+                            pathFigure.Freeze();
+                            return new PathGeometry(new PathFigure[] { pathFigure });
+                        }
+                    }
+                case DropTargetType.DocumentPaneDockBottom:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Offset(0.0, targetScreenRect.Height / 2.0);
+                        targetScreenRect.Height /= 2.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockTop:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Height /= 2.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockLeft:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Width /= 2.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+                case DropTargetType.DocumentPaneDockRight:
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+                        targetScreenRect.Offset(targetScreenRect.Width / 2.0, 0.0);
+                        targetScreenRect.Width /= 2.0;
+                        return new RectangleGeometry(targetScreenRect);
+                    }
+            }
+
+            return null;
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
new file mode 100644
index 000000000..91eb732ea
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
@@ -0,0 +1,105 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal class DocumentPaneGroupDropTarget : DropTarget<LayoutDocumentPaneGroupControl>
+    {
+        internal DocumentPaneGroupDropTarget(LayoutDocumentPaneGroupControl paneControl, Rect detectionRect, DropTargetType type)
+            : base(paneControl, detectionRect, type)
+        {
+            _targetPane = paneControl;
+        }
+
+        LayoutDocumentPaneGroupControl _targetPane;
+
+        protected override void Drop(LayoutDocumentFloatingWindow floatingWindow)
+        {
+            ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneGroupDockInside:
+                    #region DropTargetType.DocumentPaneGroupDockInside
+                    {
+                        var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
+                        var paneModel = paneGroupModel.Children[0] as LayoutDocumentPane;
+                        var sourceModel = floatingWindow.RootDocument;
+
+                        paneModel.Children.Insert(0, sourceModel);
+                    }
+                    break;
+                    #endregion
+            }
+            base.Drop(floatingWindow);
+        }
+
+        protected override void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        {
+            ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
+
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneGroupDockInside:
+                    #region DropTargetType.DocumentPaneGroupDockInside
+                    {
+                        var paneGroupModel = targetModel as LayoutDocumentPaneGroup;
+                        var paneModel = paneGroupModel.Children[0] as LayoutDocumentPane;
+                        var layoutAnchorablePaneGroup = floatingWindow.RootPanel as LayoutAnchorablePaneGroup;
+
+                        int i = 0;
+                        foreach (var anchorableToImport in layoutAnchorablePaneGroup.Descendents().OfType<LayoutAnchorable>().ToArray())
+                        {
+                            paneModel.Children.Insert(i, anchorableToImport);
+                            i++;
+                        }
+                    }
+                    break;
+                    #endregion
+            }
+
+            base.Drop(floatingWindow);
+        }
+
+        public override System.Windows.Media.Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindowModel)
+        {
+            switch (Type)
+            {
+                case DropTargetType.DocumentPaneGroupDockInside:
+                    #region DropTargetType.DocumentPaneGroupDockInside
+                    {
+                        var targetScreenRect = TargetElement.GetScreenArea();
+                        targetScreenRect.Offset(-overlayWindow.Left, -overlayWindow.Top);
+
+                        return new RectangleGeometry(targetScreenRect);
+                    } 
+                    #endregion
+            }
+
+            return null;
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
new file mode 100644
index 000000000..76e032d2c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
@@ -0,0 +1,108 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class DocumentPaneTabPanel : Panel
+    {
+        public DocumentPaneTabPanel()
+        {
+            FlowDirection = System.Windows.FlowDirection.LeftToRight;
+        }
+
+        protected override Size MeasureOverride(Size availableSize)
+        {
+            var visibleChildren = Children.Cast<UIElement>().Where(ch => ch.Visibility != System.Windows.Visibility.Collapsed); 
+
+            Size desideredSize = new Size();
+            foreach (FrameworkElement child in Children)
+            {
+                child.Measure(new Size(double.PositiveInfinity, double.PositiveInfinity));
+                    desideredSize.Width += child.DesiredSize.Width;
+
+                desideredSize.Height = Math.Max(desideredSize.Height, child.DesiredSize.Height);
+            }
+
+            return new Size(Math.Min(desideredSize.Width, availableSize.Width), desideredSize.Height);
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            restart:
+            var visibleChildren = Children.Cast<UIElement>().Where(ch => ch.Visibility != System.Windows.Visibility.Collapsed);
+            double offset = 0.0;
+            bool skipAllOthers = false;
+            foreach (TabItem doc in visibleChildren)
+            {
+                var layoutContent = doc.Content as LayoutContent;
+                if (skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width)
+                {
+                    if (layoutContent.IsSelected)
+                    {
+                        var parentContainer = layoutContent.Parent as ILayoutContainer;
+                        var parentSelector = layoutContent.Parent as ILayoutContentSelector;
+                        var parentPane = layoutContent.Parent as ILayoutPane;
+                        int contentIndex = parentSelector.IndexOf(layoutContent);
+                        if (contentIndex > 0 &&
+                            parentContainer.ChildrenCount > 1)
+                        {
+                            parentPane.MoveChild(contentIndex, 0);
+                            parentSelector.SelectedContentIndex = 0;
+                            goto restart;
+                        }
+                    }
+                    doc.Visibility = System.Windows.Visibility.Hidden;
+                    skipAllOthers = true;
+                }
+                else
+                {
+                    doc.Visibility = System.Windows.Visibility.Visible;
+                    doc.Arrange(new Rect(offset, 0.0, doc.DesiredSize.Width, finalSize.Height));
+                    offset += doc.ActualWidth + doc.Margin.Left + doc.Margin.Right;
+                }
+            }
+
+            return finalSize;
+
+        }
+
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            //if (e.LeftButton == System.Windows.Input.MouseButtonState.Pressed &&
+            //    LayoutDocumentTabItem.IsDraggingItem())
+            //{
+            //    var contentModel = LayoutDocumentTabItem.GetDraggingItem().Model;
+            //    var manager = contentModel.Root.Manager;
+            //    LayoutDocumentTabItem.ResetDraggingItem();
+          //    System.Diagnostics.Trace.WriteLine("OnMouseLeave()");
+
+
+            //    manager.StartDraggingFloatingWindowForContent(contentModel);
+            //}
+
+            base.OnMouseLeave(e);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
new file mode 100644
index 000000000..206e09270
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
@@ -0,0 +1,190 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+using System.Windows;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class DragService
+    {
+        DockingManager _manager;
+        LayoutFloatingWindowControl _floatingWindow;
+
+        public DragService(LayoutFloatingWindowControl floatingWindow)
+        {
+            _floatingWindow = floatingWindow;
+            _manager = floatingWindow.Model.Root.Manager;
+
+
+            GetOverlayWindowHosts();
+        }
+
+        List<IOverlayWindowHost> _overlayWindowHosts = new List<IOverlayWindowHost>();
+        void GetOverlayWindowHosts()
+        {
+            _overlayWindowHosts.AddRange(_manager.GetFloatingWindowsByZOrder().OfType<LayoutAnchorableFloatingWindowControl>().Where(fw => fw != _floatingWindow && fw.IsVisible));
+            _overlayWindowHosts.Add(_manager);
+        }
+
+        IOverlayWindowHost _currentHost;
+        IOverlayWindow _currentWindow;
+        List<IDropArea> _currentWindowAreas = new List<IDropArea>();
+        IDropTarget _currentDropTarget;
+
+        public void UpdateMouseLocation(Point dragPosition)
+        {
+            var floatingWindowModel = _floatingWindow.Model as LayoutFloatingWindow;
+
+            var newHost = _overlayWindowHosts.FirstOrDefault(oh => oh.HitTest(dragPosition));
+
+            if (_currentHost != null || _currentHost != newHost)
+            { 
+                //is mouse still inside current overlay window host?
+                if ((_currentHost != null && !_currentHost.HitTest(dragPosition)) ||
+                    _currentHost != newHost)
+                {
+                    //esit drop target
+                    if (_currentDropTarget != null)
+                        _currentWindow.DragLeave(_currentDropTarget);
+                    _currentDropTarget = null;
+
+                    //exit area
+                    _currentWindowAreas.ForEach(a =>
+                        _currentWindow.DragLeave(a));
+                    _currentWindowAreas.Clear();
+
+                    //hide current overlay window
+                    if (_currentWindow != null)
+                        _currentWindow.DragLeave(_floatingWindow);
+                    if (_currentHost != null)
+                        _currentHost.HideOverlayWindow();
+                    _currentHost = null;
+                }
+
+                if (_currentHost != newHost)
+                {
+                    _currentHost = newHost;
+                    _currentWindow = _currentHost.ShowOverlayWindow(_floatingWindow);
+                    _currentWindow.DragEnter(_floatingWindow);
+                }
+            }
+
+            if (_currentHost == null)
+                return;
+
+            if (_currentDropTarget != null &&
+                !_currentDropTarget.HitTest(dragPosition))
+            {
+                _currentWindow.DragLeave(_currentDropTarget);
+                _currentDropTarget = null;
+            }
+
+            List<IDropArea> areasToRemove = new List<IDropArea>();
+            _currentWindowAreas.ForEach(a =>
+            { 
+                //is mouse still inside this area?
+                if (!a.DetectionRect.Contains(dragPosition))
+                {
+                    _currentWindow.DragLeave(a);
+                    areasToRemove.Add(a);
+                }
+            });
+
+            areasToRemove.ForEach(a =>
+                _currentWindowAreas.Remove(a));
+
+
+            var areasToAdd = 
+                _currentHost.GetDropAreas(_floatingWindow).Where(cw => !_currentWindowAreas.Contains(cw) && cw.DetectionRect.Contains(dragPosition)).ToList();
+
+            _currentWindowAreas.AddRange(areasToAdd);
+
+            areasToAdd.ForEach(a =>
+                _currentWindow.DragEnter(a));
+
+            if (_currentDropTarget == null)
+            {
+                _currentWindowAreas.ForEach(wa =>
+                    {
+                        if (_currentDropTarget != null)
+                            return;
+
+                        _currentDropTarget = _currentWindow.GetTargets().FirstOrDefault(dt => dt.HitTest(dragPosition));
+                        if (_currentDropTarget != null)
+                        {
+                            _currentWindow.DragEnter(_currentDropTarget);
+                            return;
+                        }
+                    });
+            }
+
+        }
+
+        public void Drop(Point dropLocation, out bool dropHandled)
+        { 
+            dropHandled = false;
+
+            UpdateMouseLocation(dropLocation);
+
+            var floatingWindowModel = _floatingWindow.Model as LayoutFloatingWindow;
+            var root = floatingWindowModel.Root;
+
+            if (_currentHost != null)
+                _currentHost.HideOverlayWindow();
+
+            if (_currentDropTarget != null)
+            {
+                _currentWindow.DragDrop(_currentDropTarget);
+                root.CollectGarbage();
+                dropHandled = true;
+            }
+
+
+            _currentWindowAreas.ForEach(a => _currentWindow.DragLeave(a));
+
+            if (_currentDropTarget != null)
+                _currentWindow.DragLeave(_currentDropTarget);
+            if (_currentWindow != null)
+                _currentWindow.DragLeave(_floatingWindow);
+            _currentWindow = null;
+
+            _currentHost = null;
+        }
+
+        internal void Abort()
+        {
+            var floatingWindowModel = _floatingWindow.Model as LayoutFloatingWindow;
+
+            _currentWindowAreas.ForEach(a => _currentWindow.DragLeave(a));
+
+            if (_currentDropTarget != null)
+                _currentWindow.DragLeave(_currentDropTarget);
+            if (_currentWindow != null)
+                _currentWindow.DragLeave(_floatingWindow);
+            _currentWindow = null;
+            if (_currentHost != null)
+                _currentHost.HideOverlayWindow();
+            _currentHost = null;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
new file mode 100644
index 000000000..f5f998c54
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
@@ -0,0 +1,77 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public enum DropAreaType
+    {
+        DockingManager,
+
+        DocumentPane,
+
+        DocumentPaneGroup,
+
+        AnchorablePane,
+
+    }
+
+
+    public interface IDropArea
+    {
+        Rect DetectionRect { get; }
+        DropAreaType Type { get; }
+    }
+
+    public class DropArea<T> : IDropArea where T : FrameworkElement
+    {
+        internal DropArea(T areaElement, DropAreaType type)
+        {
+            _element = areaElement;
+            _detectionRect = areaElement.GetScreenArea();
+            _type = type;
+        }
+
+        Rect _detectionRect;
+
+        public Rect DetectionRect
+        {
+            get { return _detectionRect; }
+        }
+
+        DropAreaType _type;
+
+        public DropAreaType Type
+        {
+            get { return _type; }
+        }
+
+        T _element;
+        public T AreaElement
+        {
+            get
+            {
+                return _element;
+            }
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
new file mode 100644
index 000000000..4805d0121
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
@@ -0,0 +1,128 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls.Primitives;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class DropDownButton : ToggleButton
+    {
+        public DropDownButton()
+        {
+            this.Unloaded += new RoutedEventHandler(DropDownButton_Unloaded);
+        }
+
+
+        #region DropDownContextMenu
+
+        /// <summary>
+        /// DropDownContextMenu Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DropDownContextMenuProperty =
+            DependencyProperty.Register("DropDownContextMenu", typeof(ContextMenu), typeof(DropDownButton),
+                new FrameworkPropertyMetadata((ContextMenu)null,
+                    new PropertyChangedCallback(OnDropDownContextMenuChanged)));
+
+        /// <summary>
+        /// Gets or sets the DropDownContextMenu property.  This dependency property 
+        /// indicates drop down menu to show up when user click on an anchorable menu pin.
+        /// </summary>
+        public ContextMenu DropDownContextMenu
+        {
+            get { return (ContextMenu)GetValue(DropDownContextMenuProperty); }
+            set { SetValue(DropDownContextMenuProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DropDownContextMenu property.
+        /// </summary>
+        private static void OnDropDownContextMenuChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DropDownButton)d).OnDropDownContextMenuChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DropDownContextMenu property.
+        /// </summary>
+        protected virtual void OnDropDownContextMenuChanged(DependencyPropertyChangedEventArgs e)
+        {
+            var oldContextMenu = e.OldValue as ContextMenu;
+            if (oldContextMenu != null && IsChecked.GetValueOrDefault())
+                oldContextMenu.Closed -= new RoutedEventHandler(OnContextMenuClosed);
+        }
+
+        #endregion
+
+        #region DropDownContextMenuDataContext
+
+        /// <summary>
+        /// DropDownContextMenuDataContext Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DropDownContextMenuDataContextProperty =
+            DependencyProperty.Register("DropDownContextMenuDataContext", typeof(object), typeof(DropDownButton),
+                new FrameworkPropertyMetadata((object)null));
+
+        /// <summary>
+        /// Gets or sets the DropDownContextMenuDataContext property.  This dependency property 
+        /// indicates data context to set for drop down context menu.
+        /// </summary>
+        public object DropDownContextMenuDataContext
+        {
+            get { return (object)GetValue(DropDownContextMenuDataContextProperty); }
+            set { SetValue(DropDownContextMenuDataContextProperty, value); }
+        }
+
+        #endregion
+
+        protected override void OnClick()
+        {
+            if (DropDownContextMenu != null)
+            {
+                //IsChecked = true;
+                DropDownContextMenu.PlacementTarget = this;
+                DropDownContextMenu.Placement = PlacementMode.Bottom;
+                DropDownContextMenu.DataContext = DropDownContextMenuDataContext;
+                DropDownContextMenu.Closed += new RoutedEventHandler(OnContextMenuClosed);
+                DropDownContextMenu.IsOpen = true;
+            }
+
+            base.OnClick();
+        }
+
+        void OnContextMenuClosed(object sender, RoutedEventArgs e)
+        {
+            //Debug.Assert(IsChecked.GetValueOrDefault());
+            var ctxMenu = sender as ContextMenu;
+            ctxMenu.Closed -= new RoutedEventHandler(OnContextMenuClosed);
+            IsChecked = false;
+        }
+
+        void DropDownButton_Unloaded(object sender, RoutedEventArgs e)
+        {
+            DropDownContextMenu = null;
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
new file mode 100644
index 000000000..01aa6b29c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
@@ -0,0 +1,118 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using System.Windows.Input;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class DropDownControlArea : UserControl
+    {
+        //static DropDownControlArea()
+        //{
+        //    //IsHitTestVisibleProperty.OverrideMetadata(typeof(DropDownControlArea), new FrameworkPropertyMetadata(true));
+        //}
+
+        public DropDownControlArea()
+        { 
+
+        }
+
+        #region DropDownContextMenu
+
+        /// <summary>
+        /// DropDownContextMenu Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DropDownContextMenuProperty =
+            DependencyProperty.Register("DropDownContextMenu", typeof(ContextMenu), typeof(DropDownControlArea),
+                new FrameworkPropertyMetadata((ContextMenu)null));
+
+        /// <summary>
+        /// Gets or sets the DropDownContextMenu property.  This dependency property 
+        /// indicates context menu to show when a right click is detected over the area occpied by the control.
+        /// </summary>
+        public ContextMenu DropDownContextMenu
+        {
+            get { return (ContextMenu)GetValue(DropDownContextMenuProperty); }
+            set { SetValue(DropDownContextMenuProperty, value); }
+        }
+
+        #endregion
+
+        #region DropDownContextMenuDataContext
+
+        /// <summary>
+        /// DropDownContextMenuDataContext Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DropDownContextMenuDataContextProperty =
+            DependencyProperty.Register("DropDownContextMenuDataContext", typeof(object), typeof(DropDownControlArea),
+                new FrameworkPropertyMetadata((object)null));
+
+        /// <summary>
+        /// Gets or sets the DropDownContextMenuDataContext property.  This dependency property 
+        /// indicates data context to attach when context menu is shown.
+        /// </summary>
+        public object DropDownContextMenuDataContext
+        {
+            get { return (object)GetValue(DropDownContextMenuDataContextProperty); }
+            set { SetValue(DropDownContextMenuDataContextProperty, value); }
+        }
+
+        #endregion
+
+        protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseRightButtonDown(e);
+
+
+        }
+
+        protected override void OnPreviewMouseRightButtonUp(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnPreviewMouseRightButtonUp(e);
+
+            if (!e.Handled)
+            {
+                if (DropDownContextMenu != null)
+                {
+                    DropDownContextMenu.PlacementTarget = null;
+                    DropDownContextMenu.Placement = PlacementMode.MousePoint;
+                    DropDownContextMenu.DataContext = DropDownContextMenuDataContext;
+                    DropDownContextMenu.IsOpen = true;
+                   // e.Handled = true;
+                }
+            } 
+        }
+
+
+        //protected override System.Windows.Media.HitTestResult HitTestCore(System.Windows.Media.PointHitTestParameters hitTestParameters)
+        //{
+        //    var hitResult = base.HitTestCore(hitTestParameters);
+        //    if (hitResult == null)
+        //        return new PointHitTestResult(this, hitTestParameters.HitPoint);
+
+        //    return hitResult;
+        //}
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
new file mode 100644
index 000000000..d0f42b48e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
@@ -0,0 +1,115 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal abstract class DropTarget<T> : DropTargetBase, IDropTarget where T : FrameworkElement
+    {
+        protected DropTarget(T targetElement, Rect detectionRect, DropTargetType type)
+        {
+            _targetElement = targetElement;
+            _detectionRect = new Rect[] { detectionRect };
+            _type = type;
+        }
+
+        protected DropTarget(T targetElement, IEnumerable<Rect> detectionRects, DropTargetType type)
+        {
+            _targetElement = targetElement;
+            _detectionRect = detectionRects.ToArray();
+            _type = type;
+        }
+
+        Rect[] _detectionRect;
+
+        public Rect[] DetectionRects
+        {
+            get { return _detectionRect; }
+        }
+
+
+        T _targetElement;
+        public T TargetElement
+        {
+            get { return _targetElement; }
+        }
+
+        DropTargetType _type;
+
+        public DropTargetType Type
+        {
+            get { return _type; }
+        }
+
+        protected virtual void Drop(LayoutAnchorableFloatingWindow floatingWindow)
+        { }
+
+        protected virtual void Drop(LayoutDocumentFloatingWindow floatingWindow)
+        { }
+
+
+        public void Drop(LayoutFloatingWindow floatingWindow)
+        {
+            var root = floatingWindow.Root;
+            var currentActiveContent = floatingWindow.Root.ActiveContent;
+            var fwAsAnchorable = floatingWindow as LayoutAnchorableFloatingWindow;
+
+            if (fwAsAnchorable != null)
+            {
+                this.Drop(fwAsAnchorable);
+            }
+            else
+            {
+                var fwAsDocument = floatingWindow as LayoutDocumentFloatingWindow;
+                this.Drop(fwAsDocument);
+            }
+
+            Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    currentActiveContent.IsSelected = false;
+                    currentActiveContent.IsActive = false;
+                    currentActiveContent.IsActive = true;
+                }), DispatcherPriority.Background);
+        }
+
+        public virtual bool HitTest(Point dragPoint)
+        {
+            return _detectionRect.Any(dr => dr.Contains(dragPoint));
+        }
+
+        public abstract Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindow);
+
+
+
+        public void DragEnter()
+        {
+            SetIsDraggingOver(TargetElement, true);
+        }
+
+        public void DragLeave()
+        {
+            SetIsDraggingOver(TargetElement, false);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
new file mode 100644
index 000000000..fa7933700
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
@@ -0,0 +1,56 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    abstract class DropTargetBase : DependencyObject
+    {
+        #region IsDraggingOver
+
+        /// <summary>
+        /// IsDraggingOver Attached Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IsDraggingOverProperty =
+            DependencyProperty.RegisterAttached("IsDraggingOver", typeof(bool), typeof(DropTargetBase),
+                new FrameworkPropertyMetadata((bool)false));
+
+        /// <summary>
+        /// Gets the IsDraggingOver property.  This dependency property 
+        /// indicates if user is dragging a window over the target element.
+        /// </summary>
+        public static bool GetIsDraggingOver(DependencyObject d)
+        {
+            return (bool)d.GetValue(IsDraggingOverProperty);
+        }
+
+        /// <summary>
+        /// Sets the IsDraggingOver property.  This dependency property 
+        /// indicates if user is dragging away a window from the target element.
+        /// </summary>
+        public static void SetIsDraggingOver(DependencyObject d, bool value)
+        {
+            d.SetValue(IsDraggingOverProperty, value);
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
new file mode 100644
index 000000000..67839074d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
@@ -0,0 +1,50 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public enum DropTargetType
+    {
+        DockingManagerDockLeft,
+        DockingManagerDockTop,
+        DockingManagerDockRight,
+        DockingManagerDockBottom,
+
+        DocumentPaneDockLeft,
+        DocumentPaneDockTop,
+        DocumentPaneDockRight,
+        DocumentPaneDockBottom,
+        DocumentPaneDockInside,
+
+        DocumentPaneGroupDockInside,
+
+        AnchorablePaneDockLeft,
+        AnchorablePaneDockTop,
+        AnchorablePaneDockRight,
+        AnchorablePaneDockBottom,
+        AnchorablePaneDockInside,
+
+        DocumentPaneDockAsAnchorableLeft,
+        DocumentPaneDockAsAnchorableTop,
+        DocumentPaneDockAsAnchorableRight,
+        DocumentPaneDockAsAnchorableBottom,
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
new file mode 100644
index 000000000..4d4fc5c64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
@@ -0,0 +1,120 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+using System.Runtime.InteropServices;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public static class Extentions
+    {
+        public static IEnumerable<T> FindVisualChildren<T>(this DependencyObject depObj) where T : DependencyObject
+        {
+            if (depObj != null)
+            {
+                for (int i = 0; i < VisualTreeHelper.GetChildrenCount(depObj); i++)
+                {
+                    DependencyObject child = VisualTreeHelper.GetChild(depObj, i);
+                    if (child != null && child is T)
+                    {
+                        yield return (T)child;
+                    }
+
+                    foreach (T childOfChild in FindVisualChildren<T>(child))
+                    {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+
+        public static IEnumerable<T> FindLogicalChildren<T>(this DependencyObject depObj) where T : DependencyObject
+        {
+            if (depObj != null)
+            {
+                foreach (DependencyObject child in LogicalTreeHelper.GetChildren(depObj).OfType<DependencyObject>())
+                {
+                    if (child != null && child is T)
+                    {
+                        yield return (T)child;
+                    }
+
+                    foreach (T childOfChild in FindLogicalChildren<T>(child))
+                    {
+                        yield return childOfChild;
+                    }
+                }
+            }
+        }
+
+        public static DependencyObject FindVisualTreeRoot(this DependencyObject initial)
+        {
+            DependencyObject current = initial;
+            DependencyObject result = initial;
+
+            while (current != null)
+            {
+                result = current;
+                if (current is Visual || current is Visual3D)
+                {
+                    current = VisualTreeHelper.GetParent(current);
+                }
+                else
+                {
+                    // If we're in Logical Land then we must walk 
+                    // up the logical tree until we find a 
+                    // Visual/Visual3D to get us back to Visual Land.
+                    current = LogicalTreeHelper.GetParent(current);
+                }
+            }
+
+            return result;
+        }
+
+        public static T FindVisualAncestor<T>(this DependencyObject dependencyObject) where T : class
+        {
+            DependencyObject target = dependencyObject;
+            do
+            {
+                target = VisualTreeHelper.GetParent(target);
+            }
+            while (target != null && !(target is T));
+            return target as T;
+        }
+
+        public static T FindLogicalAncestor<T>(this DependencyObject dependencyObject) where T : class
+        {
+            DependencyObject target = dependencyObject;
+            do
+            {
+                var current = target;
+                target = LogicalTreeHelper.GetParent(target);
+                if (target == null)
+                    target = VisualTreeHelper.GetParent(current);
+
+            }
+            while (target != null && !(target is T));
+            return target as T;
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
new file mode 100644
index 000000000..75d331460
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
@@ -0,0 +1,273 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal static class FocusElementManager
+    {
+        #region Focus Management
+        static List<DockingManager> _managers = new List<DockingManager>();
+        internal static void SetupFocusManagement(DockingManager manager)
+        {
+            if (_managers.Count == 0)
+            {
+                //InputManager.Current.EnterMenuMode += new EventHandler(InputManager_EnterMenuMode);
+                //InputManager.Current.LeaveMenuMode += new EventHandler(InputManager_LeaveMenuMode);
+                _windowHandler = new WindowHookHandler();
+                _windowHandler.FocusChanged += new EventHandler<FocusChangeEventArgs>(WindowFocusChanging);
+                //_windowHandler.Activate += new EventHandler<WindowActivateEventArgs>(WindowActivating);
+                _windowHandler.Attach();
+
+                if (Application.Current != null)
+                    Application.Current.Exit += new ExitEventHandler(Current_Exit);
+            }
+
+            manager.PreviewGotKeyboardFocus += new KeyboardFocusChangedEventHandler(manager_PreviewGotKeyboardFocus);
+            _managers.Add(manager);
+        }
+
+        internal static void FinalizeFocusManagement(DockingManager manager)
+        {
+            manager.PreviewGotKeyboardFocus -= new KeyboardFocusChangedEventHandler(manager_PreviewGotKeyboardFocus);
+            _managers.Remove(manager);
+
+            if (_managers.Count == 0)
+            {
+                //InputManager.Current.EnterMenuMode -= new EventHandler(InputManager_EnterMenuMode);
+                //InputManager.Current.LeaveMenuMode -= new EventHandler(InputManager_LeaveMenuMode);
+                if (_windowHandler != null)
+                {
+                    _windowHandler.FocusChanged -= new EventHandler<FocusChangeEventArgs>(WindowFocusChanging);
+                    //_windowHandler.Activate -= new EventHandler<WindowActivateEventArgs>(WindowActivating);
+                    _windowHandler.Detach();
+                    _windowHandler = null;
+                }
+            }
+
+        }
+
+        private static void Current_Exit(object sender, ExitEventArgs e)
+        {
+            Application.Current.Exit -= new ExitEventHandler(Current_Exit);
+            if (_windowHandler != null)
+            {
+                _windowHandler.FocusChanged -= new EventHandler<FocusChangeEventArgs>(WindowFocusChanging);
+                //_windowHandler.Activate -= new EventHandler<WindowActivateEventArgs>(WindowActivating);
+                _windowHandler.Detach();
+                _windowHandler = null;
+            }
+        }
+
+        static void manager_PreviewGotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+        {
+            var focusedElement = e.NewFocus as Visual;
+            if (focusedElement != null &&
+                !(focusedElement is LayoutAnchorableTabItem || focusedElement is LayoutDocumentTabItem) &&
+                !(focusedElement is ICommandSource))//Avoid tracking focus for elements like this
+            {
+                var parentAnchorable = focusedElement.FindVisualAncestor<LayoutAnchorableControl>();
+                if (parentAnchorable != null)
+                {
+                    _modelFocusedElement[parentAnchorable.Model] = e.NewFocus;
+                }
+                else
+                {
+                    var parentDocument = focusedElement.FindVisualAncestor<LayoutDocumentControl>();
+                    if (parentDocument != null)
+                    {
+                        _modelFocusedElement[parentDocument.Model] = e.NewFocus;
+                    }
+                }
+            }
+        }
+
+        static FullWeakDictionary<ILayoutElement, IInputElement> _modelFocusedElement = new FullWeakDictionary<ILayoutElement, IInputElement>();
+        static WeakDictionary<ILayoutElement, IntPtr> _modelFocusedWindowHandle = new WeakDictionary<ILayoutElement, IntPtr>();
+
+        /// <summary>
+        /// Get the input element that was focused before user left the layout element
+        /// </summary>
+        /// <param name="model">Element to look for</param>
+        /// <returns>Input element </returns>
+        internal static IInputElement GetLastFocusedElement(ILayoutElement model)
+        {
+            IInputElement objectWithFocus;
+            if (_modelFocusedElement.GetValue(model, out objectWithFocus))
+                return objectWithFocus;
+
+            return null;
+        }
+
+
+        /// <summary>
+        /// Get the last window handle focused before user left the element passed as argument
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
+        internal static IntPtr GetLastWindowHandle(ILayoutElement model)
+        {
+            IntPtr handleWithFocus;
+            if (_modelFocusedWindowHandle.GetValue(model, out handleWithFocus))
+                return handleWithFocus;
+
+            return IntPtr.Zero;
+        }
+        static WeakReference _lastFocusedElement;
+
+        /// <summary>
+        /// Given a layout element tries to set the focus of the keyword where it was before user moved to another element
+        /// </summary>
+        /// <param name="model"></param>
+        internal static void SetFocusOnLastElement(ILayoutElement model)
+        {
+            bool focused = false;
+            IInputElement objectToFocus;
+            if (_modelFocusedElement.GetValue(model, out objectToFocus))
+            {
+                focused = objectToFocus == Keyboard.Focus(objectToFocus);
+            }
+
+            IntPtr handleToFocus;
+            if (_modelFocusedWindowHandle.GetValue(model, out handleToFocus))
+                focused = IntPtr.Zero != Win32Helper.SetFocus(handleToFocus);
+
+            Trace.WriteLine( string.Format( "SetFocusOnLastElement(focused={0}, model={1}, element={2})", focused, model, handleToFocus == IntPtr.Zero ? ( objectToFocus == null ? "" : objectToFocus.ToString() ) : handleToFocus.ToString() ) );
+
+            if (focused)
+            {
+                _lastFocusedElement = new WeakReference(model);
+            }
+
+        }
+
+        static WindowHookHandler _windowHandler = null;
+
+        static void WindowFocusChanging(object sender, FocusChangeEventArgs e)
+        {
+            foreach (var manager in _managers)
+            {
+                var hostContainingFocusedHandle = manager.FindLogicalChildren<HwndHost>().FirstOrDefault(hw => Win32Helper.IsChild(hw.Handle, e.GotFocusWinHandle));
+
+                if (hostContainingFocusedHandle != null)
+                {
+                    var parentAnchorable = hostContainingFocusedHandle.FindVisualAncestor<LayoutAnchorableControl>();
+                    if (parentAnchorable != null)
+                    {
+                        _modelFocusedWindowHandle[parentAnchorable.Model] = e.GotFocusWinHandle;
+                        if (parentAnchorable.Model != null)
+                            parentAnchorable.Model.IsActive = true;
+                    }
+                    else
+                    {
+                        var parentDocument = hostContainingFocusedHandle.FindVisualAncestor<LayoutDocumentControl>();
+                        if (parentDocument != null)
+                        {
+                            _modelFocusedWindowHandle[parentDocument.Model] = e.GotFocusWinHandle;
+                            if (parentDocument.Model != null)
+                                parentDocument.Model.IsActive = true;
+                        }
+                    }
+                }
+
+
+            }
+        }
+
+        static DispatcherOperation _setFocusAsyncOperation;
+
+        static void WindowActivating(object sender, WindowActivateEventArgs e)
+        {
+            Trace.WriteLine("WindowActivating");
+
+            if (Keyboard.FocusedElement == null && 
+                _lastFocusedElement != null && 
+                _lastFocusedElement.IsAlive)
+            {
+                var elementToSetFocus = _lastFocusedElement.Target as ILayoutElement;
+                if (elementToSetFocus != null)
+                {
+                    var manager = elementToSetFocus.Root.Manager;
+                    if (manager == null)
+                        return;
+
+                    IntPtr parentHwnd;
+                    if (!manager.GetParentWindowHandle(out parentHwnd))
+                        return;
+
+                    if (e.HwndActivating != parentHwnd)
+                        return;
+
+                    _setFocusAsyncOperation = Dispatcher.CurrentDispatcher.BeginInvoke(new Action(() =>
+                    {
+                        try
+                        {
+                            SetFocusOnLastElement(elementToSetFocus);
+                        }
+                        finally
+                        {
+                            _setFocusAsyncOperation = null;
+                        }
+                    }), DispatcherPriority.Background);
+                }
+            }
+        }
+
+
+        static WeakReference _lastFocusedElementBeforeEnterMenuMode = null;
+        static void InputManager_EnterMenuMode(object sender, EventArgs e)
+        {
+            if (Keyboard.FocusedElement == null)
+                return;
+
+            var lastfocusDepObj = Keyboard.FocusedElement as DependencyObject;
+            if (lastfocusDepObj.FindLogicalAncestor<DockingManager>() == null)
+            {
+                _lastFocusedElementBeforeEnterMenuMode = null;
+                return;
+            }
+
+            _lastFocusedElementBeforeEnterMenuMode = new WeakReference(Keyboard.FocusedElement);
+        }
+        static void InputManager_LeaveMenuMode(object sender, EventArgs e)
+        {
+            if (_lastFocusedElementBeforeEnterMenuMode != null &&
+                _lastFocusedElementBeforeEnterMenuMode.IsAlive)
+            {
+                var lastFocusedInputElement = _lastFocusedElementBeforeEnterMenuMode.GetValueOrDefault<UIElement>();
+                if (lastFocusedInputElement != null)
+                {
+                    if (lastFocusedInputElement != Keyboard.Focus(lastFocusedInputElement))
+                        Debug.WriteLine("Unable to activate the element");
+                }
+            }
+        }
+
+        #endregion
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
new file mode 100644
index 000000000..4fbf4b606
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
@@ -0,0 +1,106 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class FullWeakDictionary<K,V> where K : class
+    {
+        public FullWeakDictionary()
+        {}
+
+        List<WeakReference> _keys = new List<WeakReference>();
+        List<WeakReference> _values = new List<WeakReference>();
+
+        public V this[K key]
+        {
+            get
+            {
+                V valueToReturn;
+                if (!GetValue(key, out valueToReturn))
+                    throw new ArgumentException();
+                return valueToReturn;
+            }
+            set
+            {
+                SetValue(key, value);
+            }
+        }
+
+        public bool ContainsKey(K key)
+        {
+            CollectGarbage();
+            return -1 != _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+        }
+
+        public void SetValue(K key, V value)
+        {
+            CollectGarbage();
+            int vIndex = _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+            if (vIndex > -1)
+                _values[vIndex] = new WeakReference(value);
+            else
+            {
+                _values.Add(new WeakReference(value));
+                _keys.Add(new WeakReference(key));
+            }            
+        }
+
+        public bool GetValue(K key, out V value)
+        {
+            CollectGarbage();
+            int vIndex = _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+            value = default(V);
+            if (vIndex == -1)
+                return false;
+            value = _values[vIndex].GetValueOrDefault<V>();
+            return true;
+        }
+
+
+        void CollectGarbage()
+        { 
+            int vIndex = 0; 
+
+            do
+            { 
+                vIndex = _keys.FindIndex(vIndex, k => !k.IsAlive);
+                if (vIndex >= 0)
+                {
+                    _keys.RemoveAt(vIndex);
+                    _values.RemoveAt(vIndex);
+                }
+            }
+            while (vIndex >= 0);
+
+            vIndex = 0; 
+            do
+            {
+                vIndex = _values.FindIndex(vIndex, v => !v.IsAlive);
+                if (vIndex >= 0)
+                {
+                    _values.RemoveAt(vIndex);
+                    _keys.RemoveAt(vIndex);
+                }
+            }
+            while (vIndex >= 0);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
new file mode 100644
index 000000000..a437a10f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
@@ -0,0 +1,41 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal interface IDropTarget
+    {
+        Geometry GetPreviewPath(OverlayWindow overlayWindow, LayoutFloatingWindow floatingWindow);
+
+        bool HitTest(Point dragPoint);
+
+        DropTargetType Type { get; }
+
+        void Drop(LayoutFloatingWindow floatingWindow);
+
+        void DragEnter();
+
+        void DragLeave();
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
new file mode 100644
index 000000000..1eba29e83
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
@@ -0,0 +1,38 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal interface IOverlayWindow
+    {
+        IEnumerable<IDropTarget> GetTargets();
+
+        void DragEnter(LayoutFloatingWindowControl floatingWindow);
+        void DragLeave(LayoutFloatingWindowControl floatingWindow);
+
+        void DragEnter(IDropArea area);
+        void DragLeave(IDropArea area);
+
+        void DragEnter(IDropTarget target);
+        void DragLeave(IDropTarget target);
+        void DragDrop(IDropTarget target);
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
new file mode 100644
index 000000000..fcafbf1b5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
@@ -0,0 +1,29 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal interface IOverlayWindowArea
+    {
+        Rect ScreenDetectionArea { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
new file mode 100644
index 000000000..aca2dba6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
@@ -0,0 +1,31 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    interface IOverlayWindowDropTarget
+    {
+        Rect ScreenDetectionArea { get; }
+
+        OverlayWindowDropTargetType Type { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
new file mode 100644
index 000000000..f32ecffa4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
@@ -0,0 +1,37 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal interface IOverlayWindowHost
+    {
+        bool HitTest(Point dragPoint);
+
+        IOverlayWindow ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow);
+
+        void HideOverlayWindow();
+
+        IEnumerable<IDropArea> GetDropAreas(LayoutFloatingWindowControl draggingWindow);
+
+        DockingManager Manager { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
new file mode 100644
index 000000000..538008f9d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
@@ -0,0 +1,184 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorControl : Control, ILayoutControl
+    {
+        static LayoutAnchorControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorControl)));
+            Control.IsHitTestVisibleProperty.AddOwner(typeof(LayoutAnchorControl), new FrameworkPropertyMetadata(true)); 
+        }
+
+
+        internal LayoutAnchorControl(LayoutAnchorable model)
+        {
+            _model = model;
+            _model.IsActiveChanged += new EventHandler(_model_IsActiveChanged);
+            _model.IsSelectedChanged += new EventHandler(_model_IsSelectedChanged);
+
+            SetSide(_model.FindParent<LayoutAnchorSide>().Side);
+        }
+
+        void _model_IsSelectedChanged(object sender, EventArgs e)
+        {
+            if (!_model.IsAutoHidden)
+                _model.IsSelectedChanged -= new EventHandler(_model_IsSelectedChanged);
+            else if (_model.IsSelected)
+            {
+                _model.Root.Manager.ShowAutoHideWindow(this);
+                _model.IsSelected = false;
+            }
+        }
+
+        void _model_IsActiveChanged(object sender, EventArgs e)
+        {
+            if (!_model.IsAutoHidden)
+                _model.IsActiveChanged -= new EventHandler(_model_IsActiveChanged);
+            else if (_model.IsActive)
+                _model.Root.Manager.ShowAutoHideWindow(this);
+        }
+
+        LayoutAnchorable _model;
+
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        //protected override void OnVisualParentChanged(DependencyObject oldParent)
+        //{
+        //    base.OnVisualParentChanged(oldParent);
+
+        //    var contentModel = _model;
+
+        //    if (oldParent != null && contentModel != null && contentModel.Content is UIElement)
+        //    {
+        //        var oldParentPaneControl = oldParent.FindVisualAncestor<LayoutAnchorablePaneControl>();
+        //        if (oldParentPaneControl != null)
+        //        {
+        //            ((ILogicalChildrenContainer)oldParentPaneControl).InternalRemoveLogicalChild(contentModel.Content);
+        //        }
+        //    }
+
+        //    if (contentModel.Content != null && contentModel.Content is UIElement)
+        //    {
+        //        var oldLogicalParentPaneControl = LogicalTreeHelper.GetParent(contentModel.Content as UIElement)
+        //            as ILogicalChildrenContainer;
+        //        if (oldLogicalParentPaneControl != null)
+        //            oldLogicalParentPaneControl.InternalRemoveLogicalChild(contentModel.Content);
+        //    }
+
+        //    if (contentModel != null && contentModel.Content != null && contentModel.Root != null && contentModel.Content is UIElement)
+        //    {
+        //        ((ILogicalChildrenContainer)contentModel.Root.Manager).InternalAddLogicalChild(contentModel.Content);
+        //    }
+        //}
+
+
+        protected override void OnMouseDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseDown(e);
+
+            if (!e.Handled)
+            {
+                _model.Root.Manager.ShowAutoHideWindow(this);
+                _model.IsActive = true;
+            }
+        }
+
+
+        DispatcherTimer _openUpTimer = null;
+
+        protected override void OnMouseEnter(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            if (!e.Handled)
+            {
+                _openUpTimer = new DispatcherTimer(DispatcherPriority.ApplicationIdle);
+                _openUpTimer.Interval = TimeSpan.FromMilliseconds(400);
+                _openUpTimer.Tick += new EventHandler(_openUpTimer_Tick);
+                _openUpTimer.Start();
+            }
+        }
+
+        void _openUpTimer_Tick(object sender, EventArgs e)
+        {
+            _openUpTimer.Tick -= new EventHandler(_openUpTimer_Tick);
+            _openUpTimer.Stop();
+            _openUpTimer = null;
+            _model.Root.Manager.ShowAutoHideWindow(this);
+        }
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            if (_openUpTimer != null)
+            {
+                _openUpTimer.Tick -= new EventHandler(_openUpTimer_Tick);
+                _openUpTimer.Stop();
+                _openUpTimer = null;
+            }
+            base.OnMouseLeave(e);
+        }
+
+
+        #region Side
+
+        /// <summary>
+        /// Side Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey SidePropertyKey
+            = DependencyProperty.RegisterReadOnly("Side", typeof(AnchorSide), typeof(LayoutAnchorControl),
+                new FrameworkPropertyMetadata((AnchorSide)AnchorSide.Left));
+
+        public static readonly DependencyProperty SideProperty
+            = SidePropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the Side property.  This dependency property 
+        /// indicates the anchor side of the control.
+        /// </summary>
+        public AnchorSide Side
+        {
+            get { return (AnchorSide)GetValue(SideProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the Side property.  
+        /// This dependency property indicates the anchor side of the control.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetSide(AnchorSide value)
+        {
+            SetValue(SidePropertyKey, value);
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
new file mode 100644
index 000000000..d8829b635
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
@@ -0,0 +1,99 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Collections.ObjectModel;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorGroupControl : Control, ILayoutControl
+    {
+        static LayoutAnchorGroupControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorGroupControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorGroupControl)));
+        }
+
+
+        internal LayoutAnchorGroupControl(LayoutAnchorGroup model)
+        {
+            _model = model;
+            CreateChildrenViews();
+
+            _model.Children.CollectionChanged += (s, e) => OnModelChildrenCollectionChanged(e);
+        }
+
+        private void CreateChildrenViews()
+        {
+            var manager = _model.Root.Manager;
+            foreach (var childModel in _model.Children)
+            {
+                _childViews.Add(new LayoutAnchorControl(childModel) { Template = manager.AnchorTemplate });
+            }
+        }
+
+        private void OnModelChildrenCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.OldItems != null)
+                {
+                    {
+                        foreach (var childModel in e.OldItems)
+                            _childViews.Remove(_childViews.First(cv => cv.Model == childModel));
+                    }
+                }
+            }
+
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
+                _childViews.Clear();
+
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.NewItems != null)
+                {
+                    var manager = _model.Root.Manager;
+                    int insertIndex = e.NewStartingIndex;
+                    foreach (LayoutAnchorable childModel in e.NewItems)
+                    {
+                        _childViews.Insert(insertIndex++, new LayoutAnchorControl(childModel) { Template = manager.AnchorTemplate });
+                    }
+                }
+            }
+        }
+
+        ObservableCollection<LayoutAnchorControl> _childViews = new ObservableCollection<LayoutAnchorControl>();
+
+        public ObservableCollection<LayoutAnchorControl> Children
+        {
+            get { return _childViews; }
+        }
+
+
+        LayoutAnchorGroup _model;
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
new file mode 100644
index 000000000..3a3b4f2bd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
@@ -0,0 +1,252 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Collections.ObjectModel;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorSideControl : Control, ILayoutControl
+    {
+        static LayoutAnchorSideControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorSideControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorSideControl)));
+        }
+
+
+        internal LayoutAnchorSideControl(LayoutAnchorSide model)
+        {
+            if (model == null)
+                throw new ArgumentNullException("model");
+
+
+            _model = model;
+
+            CreateChildrenViews();
+
+            _model.Children.CollectionChanged += (s, e) => OnModelChildrenCollectionChanged(e);
+
+            UpdateSide();
+        }
+
+        private void CreateChildrenViews()
+        {
+            var manager = _model.Root.Manager;
+            foreach (var childModel in _model.Children)
+            {
+                _childViews.Add(manager.CreateUIElementForModel(childModel) as LayoutAnchorGroupControl);
+            }
+        }
+
+        private void OnModelChildrenCollectionChanged(System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.OldItems != null && 
+                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove || 
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                foreach (var childModel in e.OldItems)
+                    _childViews.Remove(_childViews.First(cv => cv.Model == childModel));
+            }
+
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Reset)
+                _childViews.Clear();
+
+            if (e.NewItems != null &&
+                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                var manager = _model.Root.Manager;
+                int insertIndex = e.NewStartingIndex;
+                foreach (LayoutAnchorGroup childModel in e.NewItems)
+                {
+                    _childViews.Insert(insertIndex++, manager.CreateUIElementForModel(childModel) as LayoutAnchorGroupControl);
+                }
+            }
+        }
+
+        LayoutAnchorSide _model = null;
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        ObservableCollection<LayoutAnchorGroupControl> _childViews = new ObservableCollection<LayoutAnchorGroupControl>();
+
+        public ObservableCollection<LayoutAnchorGroupControl> Children
+        {
+            get { return _childViews; }
+        }
+
+        void UpdateSide()
+        {
+            switch (_model.Side)
+            {
+                case AnchorSide.Left:
+                    SetIsLeftSide(true);
+                    break;
+                case AnchorSide.Top:
+                    SetIsTopSide(true);
+                    break;
+                case AnchorSide.Right:
+                    SetIsRightSide(true);
+                    break;
+                case AnchorSide.Bottom:
+                    SetIsBottomSide(true);
+                    break;
+            }
+        }
+
+        #region IsLeftSide
+
+        /// <summary>
+        /// IsLeftSide Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsLeftSidePropertyKey
+            = DependencyProperty.RegisterReadOnly("IsLeftSide", typeof(bool), typeof(LayoutAnchorSideControl),
+                new FrameworkPropertyMetadata((bool)false));
+
+        public static readonly DependencyProperty IsLeftSideProperty
+            = IsLeftSidePropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsLeftSide property.  This dependency property 
+        /// indicates this control is anchored to left side.
+        /// </summary>
+        public bool IsLeftSide
+        {
+            get { return (bool)GetValue(IsLeftSideProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsLeftSide property.  
+        /// This dependency property indicates this control is anchored to left side.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsLeftSide(bool value)
+        {
+            SetValue(IsLeftSidePropertyKey, value);
+        }
+
+        #endregion
+
+        #region IsTopSide
+
+        /// <summary>
+        /// IsTopSide Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsTopSidePropertyKey
+            = DependencyProperty.RegisterReadOnly("IsTopSide", typeof(bool), typeof(LayoutAnchorSideControl),
+                new FrameworkPropertyMetadata((bool)false));
+
+        public static readonly DependencyProperty IsTopSideProperty
+            = IsTopSidePropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsTopSide property.  This dependency property 
+        /// indicates this control is anchored to top side.
+        /// </summary>
+        public bool IsTopSide
+        {
+            get { return (bool)GetValue(IsTopSideProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsTopSide property.  
+        /// This dependency property indicates this control is anchored to top side.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsTopSide(bool value)
+        {
+            SetValue(IsTopSidePropertyKey, value);
+        }
+
+        #endregion
+
+        #region IsRightSide
+
+        /// <summary>
+        /// IsRightSide Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsRightSidePropertyKey
+            = DependencyProperty.RegisterReadOnly("IsRightSide", typeof(bool), typeof(LayoutAnchorSideControl),
+                new FrameworkPropertyMetadata((bool)false));
+
+        public static readonly DependencyProperty IsRightSideProperty
+            = IsRightSidePropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsRightSide property.  This dependency property 
+        /// indicates this control is anchored to right side.
+        /// </summary>
+        public bool IsRightSide
+        {
+            get { return (bool)GetValue(IsRightSideProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsRightSide property.  
+        /// This dependency property indicates this control is anchored to right side.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsRightSide(bool value)
+        {
+            SetValue(IsRightSidePropertyKey, value);
+        }
+
+        #endregion
+
+        #region IsBottomSide
+
+        /// <summary>
+        /// IsBottomSide Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsBottomSidePropertyKey
+            = DependencyProperty.RegisterReadOnly("IsBottomSide", typeof(bool), typeof(LayoutAnchorSideControl),
+                new FrameworkPropertyMetadata((bool)false));
+
+        public static readonly DependencyProperty IsBottomSideProperty
+            = IsBottomSidePropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsBottomSide property.  This dependency property 
+        /// indicates if this panel is anchored to bottom side.
+        /// </summary>
+        public bool IsBottomSide
+        {
+            get { return (bool)GetValue(IsBottomSideProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsBottomSide property.  
+        /// This dependency property indicates if this panel is anchored to bottom side.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsBottomSide(bool value)
+        {
+            SetValue(IsBottomSidePropertyKey, value);
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
new file mode 100644
index 000000000..2752a01da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
@@ -0,0 +1,134 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorableControl : Control
+    {
+        static LayoutAnchorableControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorableControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorableControl)));
+            FocusableProperty.OverrideMetadata(typeof(LayoutAnchorableControl), new FrameworkPropertyMetadata(false));
+        }
+
+        public LayoutAnchorableControl()
+        {
+            //SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+        }
+
+
+        #region Model
+
+        /// <summary>
+        /// Model Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ModelProperty =
+            DependencyProperty.Register("Model", typeof(LayoutAnchorable), typeof(LayoutAnchorableControl),
+                new FrameworkPropertyMetadata((LayoutAnchorable)null,
+                    new PropertyChangedCallback(OnModelChanged)));
+
+        /// <summary>
+        /// Gets or sets the Model property.  This dependency property 
+        /// indicates the model attached to this view.
+        /// </summary>
+        public LayoutAnchorable Model
+        {
+            get { return (LayoutAnchorable)GetValue(ModelProperty); }
+            set { SetValue(ModelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Model property.
+        /// </summary>
+        private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableControl)d).OnModelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Model property.
+        /// </summary>
+        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (Model != null)
+                SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+            else
+                SetLayoutItem(null);
+        }
+
+        #endregion
+
+        #region LayoutItem
+
+        /// <summary>
+        /// LayoutItem Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey LayoutItemPropertyKey
+            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutAnchorableControl),
+                new FrameworkPropertyMetadata((LayoutItem)null));
+
+        public static readonly DependencyProperty LayoutItemProperty
+            = LayoutItemPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the LayoutItem property.  This dependency property 
+        /// indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        public LayoutItem LayoutItem
+        {
+            get { return (LayoutItem)GetValue(LayoutItemProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the LayoutItem property.  
+        /// This dependency property indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetLayoutItem(LayoutItem value)
+        {
+            SetValue(LayoutItemPropertyKey, value);
+        }
+
+        #endregion
+
+
+        protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            if (Model != null)
+                Model.IsActive = true;
+
+            base.OnGotKeyboardFocus(e);
+        }
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
new file mode 100644
index 000000000..4545a0dbd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -0,0 +1,353 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
+using Xceed.Wpf.AvalonDock.Converters;
+using System.Diagnostics;
+using System.Windows.Controls.Primitives;
+using Xceed.Wpf.AvalonDock.Commands;
+using Microsoft.Windows.Shell;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorableFloatingWindowControl : LayoutFloatingWindowControl, IOverlayWindowHost
+    {
+        static LayoutAnchorableFloatingWindowControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorableFloatingWindowControl), new FrameworkPropertyMetadata(typeof(LayoutAnchorableFloatingWindowControl)));
+        } 
+
+
+        internal LayoutAnchorableFloatingWindowControl(LayoutAnchorableFloatingWindow model)
+            :base(model)
+        {
+            _model = model;
+            HideWindowCommand = new RelayCommand((p) => OnExecuteHideWindowCommand(p), (p) => CanExecuteHideWindowCommand(p));
+        }
+
+        internal override void UpdateThemeResources( Xceed.Wpf.AvalonDock.Themes.Theme oldTheme = null )
+        {
+            base.UpdateThemeResources(oldTheme);
+
+            if (_overlayWindow != null)
+                _overlayWindow.UpdateThemeResources(oldTheme);
+        }
+
+        LayoutAnchorableFloatingWindow _model;
+
+        public override ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        #region SingleContentLayoutItem
+
+        /// <summary>
+        /// SingleContentLayoutItem Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty SingleContentLayoutItemProperty =
+            DependencyProperty.Register("SingleContentLayoutItem", typeof(LayoutItem), typeof(LayoutAnchorableFloatingWindowControl),
+                new FrameworkPropertyMetadata((LayoutItem)null,
+                    new PropertyChangedCallback(OnSingleContentLayoutItemChanged)));
+
+        /// <summary>
+        /// Gets or sets the SingleContentLayoutItem property.  This dependency property 
+        /// indicates the layout item of the selected content when is shown a single anchorable pane.
+        /// </summary>
+        public LayoutItem SingleContentLayoutItem
+        {
+            get { return (LayoutItem)GetValue(SingleContentLayoutItemProperty); }
+            set { SetValue(SingleContentLayoutItemProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the SingleContentLayoutItem property.
+        /// </summary>
+        private static void OnSingleContentLayoutItemChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableFloatingWindowControl)d).OnSingleContentLayoutItemChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the SingleContentLayoutItem property.
+        /// </summary>
+        protected virtual void OnSingleContentLayoutItemChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            var manager = _model.Root.Manager;
+
+            Content = manager.CreateUIElementForModel(_model.RootPanel);
+
+            //SetBinding(VisibilityProperty, new Binding("IsVisible") { Source = _model, Converter = new BoolToVisibilityConverter(), Mode = BindingMode.OneWay, ConverterParameter = Visibility.Hidden });
+
+            //Issue: http://avalondock.codeplex.com/workitem/15036
+            IsVisibleChanged += (s, args) =>
+            {
+                var visibilityBinding = GetBindingExpression(VisibilityProperty);
+                if (IsVisible && (visibilityBinding == null))
+                {
+                    SetBinding(VisibilityProperty, new Binding("IsVisible") { Source = _model, Converter = new BoolToVisibilityConverter(), Mode = BindingMode.OneWay, ConverterParameter = Visibility.Hidden });
+                }
+            };
+
+            SetBinding(SingleContentLayoutItemProperty, new Binding("Model.SinglePane.SelectedContent") { Source = this, Converter = new LayoutItemFromLayoutModelConverter() });
+
+            _model.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+        }
+
+
+        void _model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "RootPanel" &&
+                _model.RootPanel == null)
+            {
+                InternalClose();
+            }
+        }
+
+
+        bool IOverlayWindowHost.HitTest(Point dragPoint)
+        {
+            Rect detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+            return detectionRect.Contains(dragPoint);
+        }
+
+        DockingManager IOverlayWindowHost.Manager
+        {
+            get { return _model.Root.Manager; }
+        }
+
+        OverlayWindow _overlayWindow = null;
+        void CreateOverlayWindow()
+        {
+            if (_overlayWindow == null)
+                _overlayWindow = new OverlayWindow(this);
+            Rect rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+            _overlayWindow.Left = rectWindow.Left;
+            _overlayWindow.Top = rectWindow.Top;
+            _overlayWindow.Width = rectWindow.Width;
+            _overlayWindow.Height = rectWindow.Height;
+        }
+
+        IOverlayWindow IOverlayWindowHost.ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow)
+        {
+            CreateOverlayWindow();
+            _overlayWindow.Owner = draggingWindow;
+            _overlayWindow.EnableDropTargets();
+            _overlayWindow.Show();
+
+            return _overlayWindow;
+        }
+
+        void IOverlayWindowHost.HideOverlayWindow()
+        {
+            _dropAreas = null;
+            _overlayWindow.Owner = null;
+            _overlayWindow.HideDropTargets();
+        }
+
+        List<IDropArea> _dropAreas = null;
+        IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowControl draggingWindow)
+        {
+            if (_dropAreas != null)
+                return _dropAreas;
+
+            _dropAreas = new List<IDropArea>();
+
+            if (draggingWindow.Model is LayoutDocumentFloatingWindow)
+                return _dropAreas;
+
+            var rootVisual = (Content as FloatingWindowContentHost).RootVisual;
+
+            foreach (var areaHost in rootVisual.FindVisualChildren<LayoutAnchorablePaneControl>())
+            {
+                _dropAreas.Add(new DropArea<LayoutAnchorablePaneControl>(
+                    areaHost,
+                    DropAreaType.AnchorablePane));
+            }
+            foreach (var areaHost in rootVisual.FindVisualChildren<LayoutDocumentPaneControl>())
+            {
+                _dropAreas.Add(new DropArea<LayoutDocumentPaneControl>(
+                    areaHost,
+                    DropAreaType.DocumentPane));
+            }
+
+            return _dropAreas;
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            var root = Model.Root;
+            root.Manager.RemoveFloatingWindow(this);
+            root.CollectGarbage();
+            if (_overlayWindow != null)
+            {
+                _overlayWindow.Close();
+                _overlayWindow = null;
+            }
+
+            base.OnClosed(e);
+
+            if (!CloseInitiatedByUser)
+            {
+                root.FloatingWindows.Remove(_model);
+            }
+
+            _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+        }
+
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            if (CloseInitiatedByUser && !KeepContentVisibleOnClose)
+            {
+                e.Cancel = true;
+                _model.Descendents().OfType<LayoutAnchorable>().ToArray().ForEach<LayoutAnchorable>((a) => a.Hide());
+            }
+
+            base.OnClosing(e);
+        }
+
+        protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            switch (msg)
+            {
+                case Win32Helper.WM_NCLBUTTONDOWN: //Left button down on title -> start dragging over docking manager
+                    if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
+                    {
+                        _model.Descendents().OfType<LayoutAnchorablePane>().First(p => p.ChildrenCount > 0 && p.SelectedContent != null).SelectedContent.IsActive = true;
+                        handled = true;
+                    }
+                    break;
+                case Win32Helper.WM_NCRBUTTONUP:
+                    if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
+                    {
+                        if (OpenContextMenu())
+                            handled = true;
+
+                        if (_model.Root.Manager.ShowSystemMenu)
+                            WindowChrome.GetWindowChrome(this).ShowSystemMenu = !handled;
+                        else
+                            WindowChrome.GetWindowChrome(this).ShowSystemMenu = false;
+                    }
+                    break;
+
+            }
+
+            return base.FilterMessage(hwnd, msg, wParam, lParam, ref handled);
+        }
+
+        bool OpenContextMenu()
+        {
+            var ctxMenu = _model.Root.Manager.AnchorableContextMenu;
+            if (ctxMenu != null && SingleContentLayoutItem != null)
+            {
+                ctxMenu.PlacementTarget = null;
+                ctxMenu.Placement = PlacementMode.MousePoint;
+                ctxMenu.DataContext = SingleContentLayoutItem;
+                ctxMenu.IsOpen = true;
+                return true;
+            }
+
+            return false;
+        }
+
+        bool IsContextMenuOpen()
+        {
+            var ctxMenu = _model.Root.Manager.AnchorableContextMenu;
+            if (ctxMenu != null && SingleContentLayoutItem != null)
+            {
+                return ctxMenu.IsOpen;
+            }
+
+            return false;
+        }
+
+        #region HideWindowCommand
+        public ICommand HideWindowCommand
+        {
+            get;
+            private set;
+        }
+
+        private bool CanExecuteHideWindowCommand(object parameter)
+        {
+            if (Model == null)
+                return false;
+
+            var root = Model.Root;
+            if (root == null)
+                return false;
+
+            var manager = root.Manager;
+            if (manager == null)
+                return false;
+
+            bool canExecute = false;
+            foreach (var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray())
+            {
+                if (!anchorable.CanHide)
+                {
+                    canExecute = false;
+                    break;
+                }
+
+                var anchorableLayoutItem = manager.GetLayoutItemFromModel(anchorable) as LayoutAnchorableItem;
+                if (anchorableLayoutItem == null ||
+                    anchorableLayoutItem.HideCommand == null ||
+                    !anchorableLayoutItem.HideCommand.CanExecute(parameter))
+                {
+                    canExecute = false;
+                    break;
+                }
+
+                canExecute = true;
+            }
+
+            return canExecute;
+        }
+
+        private void OnExecuteHideWindowCommand(object parameter)
+        {
+            var manager = Model.Root.Manager;
+            foreach (var anchorable in this.Model.Descendents().OfType<LayoutAnchorable>().ToArray())
+            {
+                var anchorableLayoutItem = manager.GetLayoutItemFromModel(anchorable) as LayoutAnchorableItem;
+                anchorableLayoutItem.HideCommand.Execute(parameter);
+            }
+        }
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
new file mode 100644
index 000000000..4a1a34d35
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
@@ -0,0 +1,363 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Input;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Commands;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorableItem : LayoutItem
+    {
+        LayoutAnchorable _anchorable;
+        internal LayoutAnchorableItem()
+        {
+
+        }
+
+        internal override void Attach(LayoutContent model)
+        {
+            _anchorable = model as LayoutAnchorable;
+            _anchorable.IsVisibleChanged += new EventHandler(_anchorable_IsVisibleChanged);
+
+            base.Attach(model);
+        }
+
+        internal override void Detach()
+        {
+            _anchorable.IsVisibleChanged -= new EventHandler(_anchorable_IsVisibleChanged);
+            _anchorable = null;
+            base.Detach();
+        }
+
+        protected override void Close()
+        {
+            var dockingManager = _anchorable.Root.Manager;
+            dockingManager._ExecuteCloseCommand(_anchorable);
+        }
+
+        ICommand _defaultHideCommand;
+        ICommand _defaultAutoHideCommand;
+        ICommand _defaultDockCommand;
+
+        protected override void InitDefaultCommands()
+        {
+            _defaultHideCommand = new RelayCommand((p) => ExecuteHideCommand(p), (p) => CanExecuteHideCommand(p));
+            _defaultAutoHideCommand = new RelayCommand((p) => ExecuteAutoHideCommand(p), (p) => CanExecuteAutoHideCommand(p));
+            _defaultDockCommand = new RelayCommand((p) => ExecuteDockCommand(p), (p) => CanExecuteDockCommand(p));
+
+            base.InitDefaultCommands();
+        }
+
+        protected override void ClearDefaultBindings()
+        {
+            if (HideCommand == _defaultHideCommand)
+                BindingOperations.ClearBinding(this, HideCommandProperty);
+            if (AutoHideCommand == _defaultAutoHideCommand)
+                BindingOperations.ClearBinding(this, AutoHideCommandProperty);
+            if (DockCommand == _defaultDockCommand)
+                BindingOperations.ClearBinding(this, DockCommandProperty);
+
+            base.ClearDefaultBindings();
+        }
+
+        protected override void SetDefaultBindings()
+        {
+            if (HideCommand == null)
+                HideCommand = _defaultHideCommand;
+            if (AutoHideCommand == null)
+                AutoHideCommand = _defaultAutoHideCommand;
+            if (DockCommand == null)
+                DockCommand = _defaultDockCommand;
+
+            Visibility = _anchorable.IsVisible ? Visibility.Visible : System.Windows.Visibility.Hidden;
+            base.SetDefaultBindings();
+        }
+
+
+        #region HideCommand
+
+        /// <summary>
+        /// HideCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty HideCommandProperty =
+            DependencyProperty.Register("HideCommand", typeof(ICommand), typeof(LayoutAnchorableItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnHideCommandChanged),
+                    new CoerceValueCallback(CoerceHideCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the HideCommand property.  This dependency property 
+        /// indicates the command to execute when an anchorable is hidden.
+        /// </summary>
+        public ICommand HideCommand
+        {
+            get { return (ICommand)GetValue(HideCommandProperty); }
+            set { SetValue(HideCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the HideCommand property.
+        /// </summary>
+        private static void OnHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableItem)d).OnHideCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the HideCommand property.
+        /// </summary>
+        protected virtual void OnHideCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the HideCommand value.
+        /// </summary>
+        private static object CoerceHideCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+
+        private bool CanExecuteHideCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            return _anchorable.CanHide;
+        }
+
+        private void ExecuteHideCommand(object parameter)
+        {
+            if (_anchorable != null && _anchorable.Root != null && _anchorable.Root.Manager != null)
+                _anchorable.Root.Manager._ExecuteHideCommand(_anchorable);
+        }
+
+        #endregion
+
+        #region AutoHideCommand
+
+        /// <summary>
+        /// AutoHideCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AutoHideCommandProperty =
+            DependencyProperty.Register("AutoHideCommand", typeof(ICommand), typeof(LayoutAnchorableItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnAutoHideCommandChanged),
+                    new CoerceValueCallback(CoerceAutoHideCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the AutoHideCommand property.  This dependency property 
+        /// indicates the command to execute when user click the auto hide button.
+        /// </summary>
+        /// <remarks>By default this command toggles auto hide state for an anchorable.</remarks>
+        public ICommand AutoHideCommand
+        {
+            get { return (ICommand)GetValue(AutoHideCommandProperty); }
+            set { SetValue(AutoHideCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AutoHideCommand property.
+        /// </summary>
+        private static void OnAutoHideCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableItem)d).OnAutoHideCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AutoHideCommand property.
+        /// </summary>
+        protected virtual void OnAutoHideCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the AutoHideCommand value.
+        /// </summary>
+        private static object CoerceAutoHideCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteAutoHideCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+
+            if (LayoutElement.FindParent<LayoutAnchorableFloatingWindow>() != null)
+                return false;//is floating
+
+            return _anchorable.CanAutoHide;
+        }
+
+        private void ExecuteAutoHideCommand(object parameter)
+        {
+            if (_anchorable != null && _anchorable.Root != null && _anchorable.Root.Manager != null)
+                _anchorable.Root.Manager._ExecuteAutoHideCommand(_anchorable);
+        }
+
+        #endregion
+
+        #region DockCommand
+
+        /// <summary>
+        /// DockCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DockCommandProperty =
+            DependencyProperty.Register("DockCommand", typeof(ICommand), typeof(LayoutAnchorableItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnDockCommandChanged),
+                    new CoerceValueCallback(CoerceDockCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the DockCommand property.  This dependency property 
+        /// indicates the command to execute when user click the Dock button.
+        /// </summary>
+        /// <remarks>By default this command moves the anchorable inside the container pane which previously hosted the object.</remarks>
+        public ICommand DockCommand
+        {
+            get { return (ICommand)GetValue(DockCommandProperty); }
+            set { SetValue(DockCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DockCommand property.
+        /// </summary>
+        private static void OnDockCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableItem)d).OnDockCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DockCommand property.
+        /// </summary>
+        protected virtual void OnDockCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the DockCommand value.
+        /// </summary>
+        private static object CoerceDockCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteDockCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            return LayoutElement.FindParent<LayoutAnchorableFloatingWindow>() != null;
+        }
+
+        private void ExecuteDockCommand(object parameter)
+        {
+            LayoutElement.Root.Manager._ExecuteDockCommand(_anchorable);
+        }
+
+        #endregion
+
+        #region Visibility
+        ReentrantFlag _visibilityReentrantFlag = new ReentrantFlag();
+
+        protected override void OnVisibilityChanged()
+        {
+            if (_anchorable != null && _anchorable.Root != null)
+            {
+                if (_visibilityReentrantFlag.CanEnter)
+                {
+                    using (_visibilityReentrantFlag.Enter())
+                    {
+                        if (Visibility == System.Windows.Visibility.Hidden)
+                            _anchorable.Hide(false);
+                        else if (Visibility == System.Windows.Visibility.Visible)
+                            _anchorable.Show();
+                    }
+                }
+            }
+
+            base.OnVisibilityChanged();
+        }
+
+
+        void _anchorable_IsVisibleChanged(object sender, EventArgs e)
+        {
+            if (_anchorable != null && _anchorable.Root != null)
+            {
+                if (_visibilityReentrantFlag.CanEnter)
+                {
+                    using (_visibilityReentrantFlag.Enter())
+                    {
+                        if (_anchorable.IsVisible)
+                            Visibility = Visibility.Visible;
+                        else
+                            Visibility = Visibility.Hidden;
+                    }
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanHide
+
+        /// <summary>
+        /// CanHide Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CanHideProperty =
+            DependencyProperty.Register("CanHide", typeof(bool), typeof(LayoutAnchorableItem),
+                new FrameworkPropertyMetadata((bool)true,
+                    new PropertyChangedCallback(OnCanHideChanged)));
+
+        /// <summary>
+        /// Gets or sets the CanHide property.  This dependency property 
+        /// indicates if user can hide the anchorable item.
+        /// </summary>
+        public bool CanHide
+        {
+            get { return (bool)GetValue(CanHideProperty); }
+            set { SetValue(CanHideProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CanHide property.
+        /// </summary>
+        private static void OnCanHideChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableItem)d).OnCanHideChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CanHide property.
+        /// </summary>
+        protected virtual void OnCanHideChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (_anchorable != null)
+                _anchorable.CanHide = (bool)e.NewValue;
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
new file mode 100644
index 000000000..62ae0ccf7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -0,0 +1,88 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorablePaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+    {
+        static LayoutAnchorablePaneControl()
+        {
+            FocusableProperty.OverrideMetadata(typeof(LayoutAnchorablePaneControl), new FrameworkPropertyMetadata(false));
+        }
+
+        public LayoutAnchorablePaneControl(LayoutAnchorablePane model)
+        {
+            if (model == null)
+                throw new ArgumentNullException("model");
+
+            _model = model;
+
+            SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this });
+            SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+
+            this.LayoutUpdated += new EventHandler(OnLayoutUpdated);
+        }
+
+        void OnLayoutUpdated(object sender, EventArgs e)
+        {
+            var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
+            modelWithAtcualSize.ActualWidth = ActualWidth;
+            modelWithAtcualSize.ActualHeight = ActualHeight;
+        }
+
+        LayoutAnchorablePane _model;
+
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            _model.SelectedContent.IsActive = true;
+
+            base.OnGotKeyboardFocus(e);
+        }
+
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            if (!e.Handled && _model.SelectedContent != null)
+                _model.SelectedContent.IsActive = true;
+        }
+
+        protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseRightButtonDown(e);
+
+            if (!e.Handled && _model.SelectedContent != null)
+                _model.SelectedContent.IsActive = true;
+
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
new file mode 100644
index 000000000..0b7769bc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
@@ -0,0 +1,67 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorablePaneGroupControl : LayoutGridControl<ILayoutAnchorablePane>, ILayoutControl
+    {
+        internal LayoutAnchorablePaneGroupControl(LayoutAnchorablePaneGroup model)
+            : base(model, model.Orientation)
+        {
+            _model = model;
+        }
+
+        LayoutAnchorablePaneGroup _model;
+
+        protected override void OnFixChildrenDockLengths()
+        {
+            #region Setup DockWidth/Height for children
+            if (_model.Orientation == Orientation.Horizontal)
+            {
+                for (int i = 0; i < _model.Children.Count; i++)
+                {
+                    var childModel = _model.Children[i] as ILayoutPositionableElement;
+                    if (!childModel.DockWidth.IsStar)
+                    {
+                        childModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < _model.Children.Count; i++)
+                {
+                    var childModel = _model.Children[i] as ILayoutPositionableElement;
+                    if (!childModel.DockHeight.IsStar)
+                    {
+                        childModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
+                    }
+                }
+            }
+            #endregion
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
new file mode 100644
index 000000000..0e25dfd19
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
@@ -0,0 +1,200 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Collections.ObjectModel;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Reflection;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAnchorableTabItem : Control
+    {
+        static LayoutAnchorableTabItem()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAnchorableTabItem), new FrameworkPropertyMetadata(typeof(LayoutAnchorableTabItem)));
+        }
+
+        public LayoutAnchorableTabItem()
+        {
+        }
+
+
+
+        #region Model
+
+        /// <summary>
+        /// Model Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ModelProperty =
+            DependencyProperty.Register("Model", typeof(LayoutContent), typeof(LayoutAnchorableTabItem),
+                new FrameworkPropertyMetadata((LayoutContent)null,
+                    new PropertyChangedCallback(OnModelChanged)));
+
+        /// <summary>
+        /// Gets or sets the Model property.  This dependency property 
+        /// indicates model attached to the anchorable tab item.
+        /// </summary>
+        public LayoutContent Model
+        {
+            get { return (LayoutContent)GetValue(ModelProperty); }
+            set { SetValue(ModelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Model property.
+        /// </summary>
+        private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutAnchorableTabItem)d).OnModelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Model property.
+        /// </summary>
+        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (Model != null)
+                SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+            else
+                SetLayoutItem(null);
+            //UpdateLogicalParent();
+        }
+
+        #endregion
+
+        #region LayoutItem
+
+        /// <summary>
+        /// LayoutItem Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey LayoutItemPropertyKey
+            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutAnchorableTabItem),
+                new FrameworkPropertyMetadata((LayoutItem)null));
+
+        public static readonly DependencyProperty LayoutItemProperty
+            = LayoutItemPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the LayoutItem property.  This dependency property 
+        /// indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        public LayoutItem LayoutItem
+        {
+            get { return (LayoutItem)GetValue(LayoutItemProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the LayoutItem property.  
+        /// This dependency property indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetLayoutItem(LayoutItem value)
+        {
+            SetValue(LayoutItemPropertyKey, value);
+        }
+
+        #endregion
+
+        bool _isMouseDown = false;
+        static LayoutAnchorableTabItem _draggingItem = null;
+
+        internal static bool IsDraggingItem()
+        {
+            return _draggingItem != null;
+        }
+
+        internal static LayoutAnchorableTabItem GetDraggingItem()
+        {
+            return _draggingItem;
+        }
+        internal static void ResetDraggingItem()
+        {
+            _draggingItem = null;
+        }
+
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            _isMouseDown = true;
+            _draggingItem = this;
+        }
+
+        protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            if (e.LeftButton != MouseButtonState.Pressed)
+            {
+                _isMouseDown = false;
+                _draggingItem = null;
+            }
+        }
+
+        protected override void OnMouseLeftButtonUp(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            _isMouseDown = false;
+
+            base.OnMouseLeftButtonUp(e);
+
+            Model.IsActive = true;
+        }
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseLeave(e);
+
+            if (_isMouseDown && e.LeftButton == MouseButtonState.Pressed)
+            {
+                _draggingItem = this;
+            }
+
+            _isMouseDown = false;
+        }
+
+        protected override void OnMouseEnter(MouseEventArgs e)
+        {
+            base.OnMouseEnter(e);
+
+            if (_draggingItem != null &&
+                _draggingItem != this &&
+                e.LeftButton == MouseButtonState.Pressed)
+            {
+              //Trace.WriteLine("Dragging item from {0} to {1}", _draggingItem, this);
+
+                var model = Model;
+                var container = model.Parent as ILayoutContainer;
+                var containerPane = model.Parent as ILayoutPane;
+                var childrenList = container.Children.ToList();
+                containerPane.MoveChild(childrenList.IndexOf(_draggingItem.Model), childrenList.IndexOf(model));
+            }
+        }
+
+        protected override void OnPreviewGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+        {
+            base.OnPreviewGotKeyboardFocus(e);
+
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
new file mode 100644
index 000000000..2be0ffc99
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
@@ -0,0 +1,572 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Interop;
+using System.Windows.Controls;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Diagnostics;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutAutoHideWindowControl : HwndHost, ILayoutControl
+    {
+        static LayoutAutoHideWindowControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(typeof(LayoutAutoHideWindowControl)));
+            UIElement.FocusableProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(true));
+            Control.IsTabStopProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(true));
+            VisibilityProperty.OverrideMetadata(typeof(LayoutAutoHideWindowControl), new FrameworkPropertyMetadata(Visibility.Hidden));
+        }
+
+        internal LayoutAutoHideWindowControl()
+        {
+        }
+
+        internal void Show(LayoutAnchorControl anchor)
+        {
+            if (_model != null)
+                throw new InvalidOperationException();
+
+            _anchor = anchor;
+            _model = anchor.Model as LayoutAnchorable;
+            _side = (anchor.Model.Parent.Parent as LayoutAnchorSide).Side;
+            _manager = _model.Root.Manager;
+            CreateInternalGrid();
+
+            _model.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+
+            Visibility = System.Windows.Visibility.Visible;
+            InvalidateMeasure();
+            UpdateWindowPos();
+            Trace.WriteLine("LayoutAutoHideWindowControl.Show()");
+        }
+
+        internal void Hide()
+        {
+            if (_model == null)
+                return;
+
+            _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(_model_PropertyChanged);
+
+            RemoveInternalGrid();
+            _anchor = null;
+            _model = null;
+            _manager = null;
+            Visibility = System.Windows.Visibility.Hidden;
+
+            Trace.WriteLine("LayoutAutoHideWindowControl.Hide()");
+        }
+
+        LayoutAnchorControl _anchor;
+
+        LayoutAnchorable _model;
+
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        HwndSource _internalHwndSource = null;
+        IntPtr parentWindowHandle;
+        protected override System.Runtime.InteropServices.HandleRef BuildWindowCore(System.Runtime.InteropServices.HandleRef hwndParent)
+        {
+            parentWindowHandle = hwndParent.Handle;
+            _internalHwndSource = new HwndSource(new HwndSourceParameters()
+            {
+                ParentWindow = hwndParent.Handle,
+                WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
+                Width = 0,
+                Height = 0,
+            });
+
+            _internalHost_ContentRendered = false;
+            _internalHwndSource.ContentRendered += _internalHwndSource_ContentRendered;
+            _internalHwndSource.RootVisual = _internalHostPresenter;
+            AddLogicalChild(_internalHostPresenter);
+            Win32Helper.BringWindowToTop(_internalHwndSource.Handle);
+            return new HandleRef(this, _internalHwndSource.Handle);
+        }
+
+        private bool _internalHost_ContentRendered = false;
+
+        void _internalHwndSource_ContentRendered(object sender, EventArgs e)
+        {
+            _internalHost_ContentRendered = true;
+        }
+
+        protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            if (msg == Win32Helper.WM_WINDOWPOSCHANGING)
+            {
+                if (_internalHost_ContentRendered)
+                    Win32Helper.SetWindowPos(_internalHwndSource.Handle, Win32Helper.HWND_TOP, 0, 0, 0, 0, Win32Helper.SetWindowPosFlags.IgnoreMove | Win32Helper.SetWindowPosFlags.IgnoreResize);
+            }
+            return base.WndProc(hwnd, msg, wParam, lParam, ref handled);
+        }
+
+        protected override void DestroyWindowCore(System.Runtime.InteropServices.HandleRef hwnd)
+        {
+            if (_internalHwndSource != null)
+            {
+                _internalHwndSource.ContentRendered -= _internalHwndSource_ContentRendered;
+                _internalHwndSource.Dispose();
+                _internalHwndSource = null;
+            }
+        }
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+
+        }
+
+        ContentPresenter _internalHostPresenter = new ContentPresenter();
+        Grid _internalGrid = null;
+        LayoutAnchorableControl _internalHost = null;
+        AnchorSide _side;
+        LayoutGridResizerControl _resizer = null;
+        DockingManager _manager;
+
+        void _model_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "IsAutoHidden")
+            {
+                if (!_model.IsAutoHidden)
+                {
+                    _manager.HideAutoHideWindow(_anchor);
+                }
+            }
+        }
+
+        void CreateInternalGrid()
+        {
+            _internalGrid = new Grid() { FlowDirection = System.Windows.FlowDirection.LeftToRight};
+            _internalGrid.SetBinding(Grid.BackgroundProperty, new Binding("Background") { Source = this });
+
+
+            _internalHost = new LayoutAnchorableControl() { Model = _model, Style = AnchorableStyle };
+            _internalHost.SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+
+            KeyboardNavigation.SetTabNavigation(_internalGrid, KeyboardNavigationMode.Cycle);
+
+            _resizer = new LayoutGridResizerControl();
+
+            _resizer.DragStarted += new System.Windows.Controls.Primitives.DragStartedEventHandler(OnResizerDragStarted);
+            _resizer.DragDelta += new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnResizerDragDelta);
+            _resizer.DragCompleted += new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnResizerDragCompleted);
+
+            if (_side == AnchorSide.Right)
+            {
+                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition(){ Width = new GridLength(_manager.GridSplitterWidth)});
+                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition(){
+                    Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel)});
+
+                Grid.SetColumn(_resizer, 0);
+                Grid.SetColumn(_internalHost, 1);
+
+                _resizer.Cursor = Cursors.SizeWE;
+
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Right;
+                VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
+            }
+            else if (_side == AnchorSide.Left)
+            {
+                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition()
+                {
+                    Width = _model.AutoHideWidth == 0.0 ? new GridLength(_model.AutoHideMinWidth) : new GridLength(_model.AutoHideWidth, GridUnitType.Pixel),
+                });
+                _internalGrid.ColumnDefinitions.Add(new ColumnDefinition() { Width = new GridLength(_manager.GridSplitterWidth) });
+
+                Grid.SetColumn(_internalHost, 0);
+                Grid.SetColumn(_resizer, 1);
+
+                _resizer.Cursor = Cursors.SizeWE;
+
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Left;
+                VerticalAlignment = System.Windows.VerticalAlignment.Stretch;
+            }
+            else if (_side == AnchorSide.Top)
+            {
+                _internalGrid.RowDefinitions.Add(new RowDefinition()
+                {
+                    Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),
+                });
+                _internalGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(_manager.GridSplitterHeight) });
+
+                Grid.SetRow(_internalHost, 0);
+                Grid.SetRow(_resizer, 1);
+
+                _resizer.Cursor = Cursors.SizeNS;
+
+                VerticalAlignment = System.Windows.VerticalAlignment.Top;
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+
+            }
+            else if (_side == AnchorSide.Bottom)
+            {
+                _internalGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(_manager.GridSplitterHeight) });
+                _internalGrid.RowDefinitions.Add(new RowDefinition()
+                {
+                    Height = _model.AutoHideHeight == 0.0 ? new GridLength(_model.AutoHideMinHeight) : new GridLength(_model.AutoHideHeight, GridUnitType.Pixel),
+                });
+
+                Grid.SetRow(_resizer, 0);
+                Grid.SetRow(_internalHost, 1);
+
+                _resizer.Cursor = Cursors.SizeNS;
+
+                VerticalAlignment = System.Windows.VerticalAlignment.Bottom;
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch;
+            }
+
+
+            _internalGrid.Children.Add(_resizer);
+            _internalGrid.Children.Add(_internalHost);
+            _internalHostPresenter.Content = _internalGrid;
+        }
+
+        void RemoveInternalGrid()
+        {
+            _resizer.DragStarted -= new System.Windows.Controls.Primitives.DragStartedEventHandler(OnResizerDragStarted);
+            _resizer.DragDelta -= new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnResizerDragDelta);
+            _resizer.DragCompleted -= new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnResizerDragCompleted);
+
+            _internalHostPresenter.Content = null;
+        }
+
+
+        protected override bool HasFocusWithinCore()
+        {
+            return false;
+        }
+
+        #region Resizer
+
+        Border _resizerGhost = null;
+        Window _resizerWindowHost = null;
+        Vector _initialStartPoint;
+
+        void ShowResizerOverlayWindow(LayoutGridResizerControl splitter)
+        {
+            _resizerGhost = new Border()
+            {
+                Background = splitter.BackgroundWhileDragging,
+                Opacity = splitter.OpacityWhileDragging
+            };
+
+            var areaElement = _manager.GetAutoHideAreaElement();
+            var modelControlActualSize = this._internalHost.TransformActualSizeToAncestor();
+
+            Point ptTopLeftScreen = areaElement.PointToScreenDPIWithoutFlowDirection(new Point());
+
+            var managerSize = areaElement.TransformActualSizeToAncestor();
+
+            Size windowSize;
+
+            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
+            {
+                windowSize = new Size(
+                    managerSize.Width - 25.0 + splitter.ActualWidth,
+                    managerSize.Height);
+
+                _resizerGhost.Width = splitter.ActualWidth;
+                _resizerGhost.Height = windowSize.Height;
+                ptTopLeftScreen.Offset(25, 0.0);
+            }
+            else
+            {
+                windowSize = new Size(
+                    managerSize.Width,
+                    managerSize.Height - _model.AutoHideMinHeight - 25.0 + splitter.ActualHeight);
+
+                _resizerGhost.Height = splitter.ActualHeight;
+                _resizerGhost.Width = windowSize.Width;
+                ptTopLeftScreen.Offset(0.0, 25.0);
+            }
+
+            _initialStartPoint = splitter.PointToScreenDPIWithoutFlowDirection(new Point()) - ptTopLeftScreen;
+
+            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
+            {
+                Canvas.SetLeft(_resizerGhost, _initialStartPoint.X);
+            }
+            else
+            {
+                Canvas.SetTop(_resizerGhost, _initialStartPoint.Y);
+            }
+
+            Canvas panelHostResizer = new Canvas()
+            {
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                VerticalAlignment = System.Windows.VerticalAlignment.Stretch
+            };
+
+            panelHostResizer.Children.Add(_resizerGhost);
+
+
+            _resizerWindowHost = new Window()
+            {
+                ResizeMode = ResizeMode.NoResize,
+                WindowStyle = System.Windows.WindowStyle.None,
+                ShowInTaskbar = false,
+                AllowsTransparency = true,
+                Background = null,
+                Width = windowSize.Width,
+                Height = windowSize.Height,
+                Left = ptTopLeftScreen.X,
+                Top = ptTopLeftScreen.Y,
+                ShowActivated = false,
+                Owner = Window.GetWindow(this),
+                Content = panelHostResizer
+            };
+
+            _resizerWindowHost.Show();
+        }
+
+        void HideResizerOverlayWindow()
+        {
+            if (_resizerWindowHost != null)
+            {
+                _resizerWindowHost.Close();
+                _resizerWindowHost = null;
+            }
+        }
+
+        internal bool IsResizing
+        {
+            get;
+            private set;
+        }
+
+        void OnResizerDragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+            var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+            var trToWnd = TransformToAncestor(rootVisual);
+            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
+                trToWnd.Transform(new Point());
+
+            double delta;
+            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
+                delta = Canvas.GetLeft(_resizerGhost) - _initialStartPoint.X;
+            else
+                delta = Canvas.GetTop(_resizerGhost) - _initialStartPoint.Y;
+
+            if (_side == AnchorSide.Right)
+            {
+                if (_model.AutoHideWidth == 0.0)
+                    _model.AutoHideWidth = _internalHost.ActualWidth - delta;
+                else
+                    _model.AutoHideWidth -= delta;
+
+                _internalGrid.ColumnDefinitions[1].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
+            }
+            else if (_side == AnchorSide.Left)
+            {
+                if (_model.AutoHideWidth == 0.0)
+                    _model.AutoHideWidth = _internalHost.ActualWidth + delta;
+                else
+                    _model.AutoHideWidth += delta;
+
+                _internalGrid.ColumnDefinitions[0].Width = new GridLength(_model.AutoHideWidth, GridUnitType.Pixel);
+            }
+            else if (_side == AnchorSide.Top)
+            {
+                if (_model.AutoHideHeight == 0.0)
+                    _model.AutoHideHeight = _internalHost.ActualHeight + delta;
+                else
+                    _model.AutoHideHeight += delta;
+
+                _internalGrid.RowDefinitions[0].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
+            }
+            else if (_side == AnchorSide.Bottom)
+            {
+                if (_model.AutoHideHeight == 0.0)
+                    _model.AutoHideHeight = _internalHost.ActualHeight - delta;
+                else
+                    _model.AutoHideHeight -= delta;
+
+                _internalGrid.RowDefinitions[1].Height = new GridLength(_model.AutoHideHeight, GridUnitType.Pixel);
+            }
+
+            HideResizerOverlayWindow();
+
+            IsResizing = false;
+            InvalidateMeasure();
+        }
+
+        void OnResizerDragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
+        {
+            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+            var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+            var trToWnd = TransformToAncestor(rootVisual);
+            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
+                trToWnd.Transform(new Point());
+
+            if (_side == AnchorSide.Right || _side == AnchorSide.Left)
+            {
+                if (FrameworkElement.GetFlowDirection(_internalHost) == System.Windows.FlowDirection.RightToLeft)
+                    transformedDelta.X = -transformedDelta.X;
+                Canvas.SetLeft(_resizerGhost, MathHelper.MinMax(_initialStartPoint.X + transformedDelta.X, 0.0, _resizerWindowHost.Width - _resizerGhost.Width));
+            }
+            else
+            {
+                Canvas.SetTop(_resizerGhost, MathHelper.MinMax(_initialStartPoint.Y + transformedDelta.Y, 0.0, _resizerWindowHost.Height - _resizerGhost.Height));
+            }
+        }
+
+        void OnResizerDragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
+        {
+            var resizer = sender as LayoutGridResizerControl;
+            ShowResizerOverlayWindow(resizer);
+            IsResizing = true;
+        }
+        #endregion
+
+        protected override System.Collections.IEnumerator LogicalChildren
+        {
+            get
+            {
+                if (_internalHostPresenter == null)
+                    return new UIElement[] { }.GetEnumerator();
+                return new UIElement[] { _internalHostPresenter }.GetEnumerator();
+            }
+        }
+
+        protected override Size MeasureOverride(Size constraint)
+        {
+            if (_internalHostPresenter == null)
+                return base.MeasureOverride(constraint);
+
+            _internalHostPresenter.Measure(constraint);
+            //return base.MeasureOverride(constraint);
+            return _internalHostPresenter.DesiredSize;
+        }
+
+        protected override Size ArrangeOverride(Size finalSize)
+        {
+            if (_internalHostPresenter == null)
+                return base.ArrangeOverride(finalSize);
+
+            _internalHostPresenter.Arrange(new Rect(finalSize));
+            return base.ArrangeOverride(finalSize);// new Size(_internalHostPresenter.ActualWidth, _internalHostPresenter.ActualHeight);
+        }
+
+        WeakReference _lastFocusedElement = null;
+        protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+        {
+            base.OnGotKeyboardFocus(e);
+            if (!e.Handled && _internalHostPresenter != null)
+            {
+                if (e.NewFocus == _internalHostPresenter)
+                {
+                    var elementToFocus = _lastFocusedElement.GetValueOrDefault<IInputElement>();
+                    if (elementToFocus != null)
+                        Keyboard.Focus(elementToFocus);
+                    e.Handled = true;
+                }
+                else
+                    _lastFocusedElement = new WeakReference(e.NewFocus);
+            }
+        }
+
+        #region Background
+
+        /// <summary>
+        /// Background Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty BackgroundProperty =
+            DependencyProperty.Register("Background", typeof(Brush), typeof(LayoutAutoHideWindowControl),
+                new FrameworkPropertyMetadata((Brush)null));
+
+        /// <summary>
+        /// Gets or sets the Background property.  This dependency property 
+        /// indicates background of the autohide childwindow.
+        /// </summary>
+        public Brush Background
+        {
+            get { return (Brush)GetValue(BackgroundProperty); }
+            set { SetValue(BackgroundProperty, value); }
+        }
+
+        #endregion
+
+        internal bool IsWin32MouseOver
+        {
+            get
+            {
+                var ptMouse = new Win32Helper.Win32Point();
+                if (!Win32Helper.GetCursorPos(ref ptMouse))
+                    return false;
+
+                Point location = this.PointToScreenDPI(new Point());
+
+                Rect rectWindow = this.GetScreenArea();
+                if (rectWindow.Contains(new Point(ptMouse.X, ptMouse.Y)))
+                    return true;
+
+                var manager = Model.Root.Manager;
+                var anchor = manager.FindVisualChildren<LayoutAnchorControl>().Where(c => c.Model == Model).FirstOrDefault();
+
+                if (anchor == null)
+                    return false;
+
+                location = anchor.PointToScreenDPI(new Point());
+
+                if (anchor.IsMouseOver)
+                    return true;
+
+                return false;
+            }
+        }
+
+        #region AnchorableStyle
+
+        /// <summary>
+        /// AnchorableStyle Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableStyleProperty =
+            DependencyProperty.Register("AnchorableStyle", typeof(Style), typeof(LayoutAutoHideWindowControl),
+                new FrameworkPropertyMetadata((Style)null));
+
+        /// <summary>
+        /// Gets or sets the AnchorableStyle property. This dependency property 
+        /// indicates the style to apply to the LayoutAnchorableControl hosted in this auto hide window.
+        /// </summary>
+        public Style AnchorableStyle
+        {
+            get { return (Style)GetValue(AnchorableStyleProperty); }
+            set { SetValue(AnchorableStyleProperty, value); }
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
new file mode 100644
index 000000000..e48d8ac12
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
@@ -0,0 +1,131 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentControl : Control
+    {
+        static LayoutDocumentControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(typeof(LayoutDocumentControl)));
+            FocusableProperty.OverrideMetadata(typeof(LayoutDocumentControl), new FrameworkPropertyMetadata(false));
+        }
+
+        public LayoutDocumentControl()
+        {
+            //SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+
+        }
+
+
+        #region Model
+
+        /// <summary>
+        /// Model Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ModelProperty =
+            DependencyProperty.Register("Model", typeof(LayoutContent), typeof(LayoutDocumentControl),
+                new FrameworkPropertyMetadata((LayoutContent)null,
+                    new PropertyChangedCallback(OnModelChanged)));
+
+        /// <summary>
+        /// Gets or sets the Model property.  This dependency property 
+        /// indicates the model attached to this view.
+        /// </summary>
+        public LayoutContent Model
+        {
+            get { return (LayoutContent)GetValue(ModelProperty); }
+            set { SetValue(ModelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Model property.
+        /// </summary>
+        private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutDocumentControl)d).OnModelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Model property.
+        /// </summary>
+        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (Model != null)
+                SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+            else
+                SetLayoutItem(null);
+        }
+        #endregion
+
+        #region LayoutItem
+
+        /// <summary>
+        /// LayoutItem Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey LayoutItemPropertyKey
+            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutDocumentControl),
+                new FrameworkPropertyMetadata((LayoutItem)null));
+
+        public static readonly DependencyProperty LayoutItemProperty
+            = LayoutItemPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the LayoutItem property.  This dependency property 
+        /// indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        public LayoutItem LayoutItem
+        {
+            get { return (LayoutItem)GetValue(LayoutItemProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the LayoutItem property.  
+        /// This dependency property indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetLayoutItem(LayoutItem value)
+        {
+            SetValue(LayoutItemPropertyKey, value);
+        }
+
+        #endregion
+
+        protected override void OnPreviewGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            if (Model != null)
+                Model.IsActive = true;
+            base.OnPreviewGotKeyboardFocus(e);
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
new file mode 100644
index 000000000..3042d9a9b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -0,0 +1,143 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using Microsoft.Windows.Shell;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentFloatingWindowControl : LayoutFloatingWindowControl
+    {
+        static LayoutDocumentFloatingWindowControl()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutDocumentFloatingWindowControl), new FrameworkPropertyMetadata(typeof(LayoutDocumentFloatingWindowControl)));
+        } 
+
+        internal LayoutDocumentFloatingWindowControl(LayoutDocumentFloatingWindow model)
+            :base(model)
+        {
+            _model = model;
+        }
+
+
+        LayoutDocumentFloatingWindow _model;
+
+        public override ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        public LayoutItem RootDocumentLayoutItem
+        {
+            get { return _model.Root.Manager.GetLayoutItemFromModel(_model.RootDocument); }
+        }
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            if (_model.RootDocument == null)
+            {
+                InternalClose();
+            }
+            else
+            {
+                var manager = _model.Root.Manager;
+
+                Content = manager.CreateUIElementForModel(_model.RootDocument);
+
+                _model.RootDocumentChanged += new EventHandler(_model_RootDocumentChanged);
+            }
+        }
+
+        void _model_RootDocumentChanged(object sender, EventArgs e)
+        {
+            if (_model.RootDocument == null)
+            {
+                InternalClose();
+            }
+        }
+
+        protected override IntPtr FilterMessage(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            switch (msg)
+            {
+                case Win32Helper.WM_NCLBUTTONDOWN: //Left button down on title -> start dragging over docking manager
+                    if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
+                    {
+                        if (_model.RootDocument != null)
+                            _model.RootDocument.IsActive = true;
+                    }
+                    break;
+                case Win32Helper.WM_NCRBUTTONUP:
+                    if (wParam.ToInt32() == Win32Helper.HT_CAPTION)
+                    {
+                        if (OpenContextMenu())
+                            handled = true;
+                        if (_model.Root.Manager.ShowSystemMenu)
+                            WindowChrome.GetWindowChrome(this).ShowSystemMenu = !handled;
+                        else
+                            WindowChrome.GetWindowChrome(this).ShowSystemMenu = false;
+                    }
+                    break;
+
+            }
+
+            return base.FilterMessage(hwnd, msg, wParam, lParam, ref handled);
+        }
+
+        bool OpenContextMenu()
+        {
+            var ctxMenu = _model.Root.Manager.DocumentContextMenu;
+            if (ctxMenu != null && RootDocumentLayoutItem != null)
+            {
+                ctxMenu.PlacementTarget = null;
+                ctxMenu.Placement = PlacementMode.MousePoint;
+                ctxMenu.DataContext = RootDocumentLayoutItem;
+                ctxMenu.IsOpen = true;
+                return true;
+            }
+
+            return false;
+        }
+
+
+        protected override void OnClosed(EventArgs e)
+        {
+            var root = Model.Root;
+            root.Manager.RemoveFloatingWindow(this);
+            root.CollectGarbage();
+
+            base.OnClosed(e);
+
+            if (!CloseInitiatedByUser)
+            {
+                root.FloatingWindows.Remove(_model);
+            }
+
+            _model.RootDocumentChanged -= new EventHandler(_model_RootDocumentChanged);
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
new file mode 100644
index 000000000..142426f06
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
@@ -0,0 +1,90 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentItem : LayoutItem
+    {
+        LayoutDocument _document;
+        internal LayoutDocumentItem()
+        {
+
+        }
+
+        internal override void Attach(LayoutContent model)
+        {
+            _document = model as LayoutDocument;
+            base.Attach(model);
+        }
+
+        protected override void Close()
+        {
+            var dockingManager = _document.Root.Manager;
+            dockingManager._ExecuteCloseCommand(_document);
+        }
+
+        #region Description
+
+        /// <summary>
+        /// Description Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DescriptionProperty =
+            DependencyProperty.Register("Description", typeof(string), typeof(LayoutDocumentItem),
+                new FrameworkPropertyMetadata((string)null,
+                    new PropertyChangedCallback(OnDescriptionChanged)));
+
+        /// <summary>
+        /// Gets or sets the Description property.  This dependency property 
+        /// indicates the description to display for the document item.
+        /// </summary>
+        public string Description
+        {
+            get { return (string)GetValue(DescriptionProperty); }
+            set { SetValue(DescriptionProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Description property.
+        /// </summary>
+        private static void OnDescriptionChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutDocumentItem)d).OnDescriptionChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Description property.
+        /// </summary>
+        protected virtual void OnDescriptionChanged(DependencyPropertyChangedEventArgs e)
+        {
+            _document.Description = (string)e.NewValue;
+        }
+
+        #endregion
+
+        internal override void Detach()
+        {
+            _document = null;
+            base.Detach();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
new file mode 100644
index 000000000..f6aebc4dd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
@@ -0,0 +1,109 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Collections.ObjectModel;
+using System.Windows.Controls;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentPaneControl : TabControl, ILayoutControl//, ILogicalChildrenContainer
+    {
+        static LayoutDocumentPaneControl()
+        {
+            FocusableProperty.OverrideMetadata(typeof(LayoutDocumentPaneControl), new FrameworkPropertyMetadata(false));
+        }
+
+
+        internal LayoutDocumentPaneControl(LayoutDocumentPane model)
+        {
+            if (model == null)
+                throw new ArgumentNullException("model");
+
+            _model = model;
+            SetBinding(ItemsSourceProperty, new Binding("Model.Children") { Source = this });
+            SetBinding(FlowDirectionProperty, new Binding("Model.Root.Manager.FlowDirection") { Source = this });
+
+            this.LayoutUpdated += new EventHandler(OnLayoutUpdated);
+        }
+
+        void OnLayoutUpdated(object sender, EventArgs e)
+        {
+            var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
+            modelWithAtcualSize.ActualWidth = ActualWidth;
+            modelWithAtcualSize.ActualHeight = ActualHeight;
+        }
+
+        protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            base.OnGotKeyboardFocus(e);
+            System.Diagnostics.Trace.WriteLine( string.Format( "OnGotKeyboardFocus({0}, {1})", e.Source, e.NewFocus ) );
+
+
+            //if (_model.SelectedContent != null)
+            //    _model.SelectedContent.IsActive = true;
+
+        }
+
+        protected override void OnSelectionChanged(SelectionChangedEventArgs e)
+        {
+            base.OnSelectionChanged(e);
+
+            if (_model.SelectedContent != null)
+                _model.SelectedContent.IsActive = true;
+        }
+
+        List<object> _logicalChildren = new List<object>();
+
+        protected override System.Collections.IEnumerator LogicalChildren
+        {
+            get
+            {
+                return _logicalChildren.GetEnumerator();
+            }
+        }
+
+        LayoutDocumentPane _model;
+
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            if (!e.Handled && _model.SelectedContent != null)
+                _model.SelectedContent.IsActive = true;
+        }
+
+        protected override void OnMouseRightButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseRightButtonDown(e);
+
+            if (!e.Handled && _model.SelectedContent != null)
+                _model.SelectedContent.IsActive = true;
+
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
new file mode 100644
index 000000000..e9b368f5f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
@@ -0,0 +1,66 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentPaneGroupControl : LayoutGridControl<ILayoutDocumentPane>, ILayoutControl
+    {
+        internal LayoutDocumentPaneGroupControl(LayoutDocumentPaneGroup model)
+            :base(model, model.Orientation)
+        {
+            _model = model;
+        }
+
+        LayoutDocumentPaneGroup _model;
+
+        protected override void OnFixChildrenDockLengths()
+        {
+            #region Setup DockWidth/Height for children
+            if (_model.Orientation == Orientation.Horizontal)
+            {
+                for (int i = 0; i < _model.Children.Count; i++)
+                {
+                    var childModel = _model.Children[i] as ILayoutPositionableElement;
+                    if (!childModel.DockWidth.IsStar)
+                    {
+                        childModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
+                    }
+                }
+            }
+            else
+            {
+                for (int i = 0; i < _model.Children.Count; i++)
+                {
+                    var childModel = _model.Children[i] as ILayoutPositionableElement;
+                    if (!childModel.DockHeight.IsStar)
+                    {
+                        childModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
+                    }
+                }
+            }
+            #endregion
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
new file mode 100644
index 000000000..e22098c74
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
@@ -0,0 +1,228 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Diagnostics;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutDocumentTabItem : Control
+    {
+        static LayoutDocumentTabItem()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutDocumentTabItem), new FrameworkPropertyMetadata(typeof(LayoutDocumentTabItem)));
+        }
+
+        public LayoutDocumentTabItem()
+        {
+        }
+
+        #region Model
+
+        /// <summary>
+        /// Model Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ModelProperty =
+            DependencyProperty.Register("Model", typeof(LayoutContent), typeof(LayoutDocumentTabItem),
+                new FrameworkPropertyMetadata((LayoutContent)null,
+                    new PropertyChangedCallback(OnModelChanged)));
+
+        /// <summary>
+        /// Gets or sets the Model property.  This dependency property 
+        /// indicates the layout content model attached to the tab item.
+        /// </summary>
+        public LayoutContent Model
+        {
+            get { return (LayoutContent)GetValue(ModelProperty); }
+            set { SetValue(ModelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Model property.
+        /// </summary>
+        private static void OnModelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutDocumentTabItem)d).OnModelChanged(e);
+        }
+
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Model property.
+        /// </summary>
+        protected virtual void OnModelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (Model != null)
+                SetLayoutItem(Model.Root.Manager.GetLayoutItemFromModel(Model));
+            else
+                SetLayoutItem(null);
+            //UpdateLogicalParent();
+        }
+
+        #endregion
+
+        #region LayoutItem
+
+        /// <summary>
+        /// LayoutItem Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey LayoutItemPropertyKey
+            = DependencyProperty.RegisterReadOnly("LayoutItem", typeof(LayoutItem), typeof(LayoutDocumentTabItem),
+                new FrameworkPropertyMetadata((LayoutItem)null));
+
+        public static readonly DependencyProperty LayoutItemProperty
+            = LayoutItemPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the LayoutItem property.  This dependency property 
+        /// indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        public LayoutItem LayoutItem
+        {
+            get { return (LayoutItem)GetValue(LayoutItemProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the LayoutItem property.  
+        /// This dependency property indicates the LayoutItem attached to this tag item.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetLayoutItem(LayoutItem value)
+        {
+            SetValue(LayoutItemPropertyKey, value);
+        }
+
+        #endregion
+
+        List<Rect> _otherTabsScreenArea = null;
+        List<TabItem> _otherTabs = null;
+        Rect _parentDocumentTabPanelScreenArea;
+        DocumentPaneTabPanel _parentDocumentTabPanel;
+        bool _isMouseDown = false;
+        Point _mouseDownPoint;
+
+        void UpdateDragDetails()
+        {
+            _parentDocumentTabPanel = this.FindLogicalAncestor<DocumentPaneTabPanel>();
+            _parentDocumentTabPanelScreenArea = _parentDocumentTabPanel.GetScreenArea();
+            _otherTabs = _parentDocumentTabPanel.Children.Cast<TabItem>().Where(ch =>
+                ch.Visibility != System.Windows.Visibility.Collapsed).ToList();
+            Rect currentTabScreenArea = this.FindLogicalAncestor<TabItem>().GetScreenArea();
+            _otherTabsScreenArea = _otherTabs.Select(ti => 
+                {
+                    var screenArea = ti.GetScreenArea();
+                    return new Rect(screenArea.Left, screenArea.Top, currentTabScreenArea.Width, screenArea.Height);
+                }).ToList();
+        }
+
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonDown(e);
+
+            Model.IsActive = true;
+
+            if (e.ClickCount == 1)
+            {
+                _mouseDownPoint = e.GetPosition(this);
+                _isMouseDown = true;
+            }
+        }
+
+        protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseMove(e);
+
+            if (_isMouseDown)
+            {
+                Point ptMouseMove = e.GetPosition(this);
+
+                if (Math.Abs(ptMouseMove.X - _mouseDownPoint.X) > SystemParameters.MinimumHorizontalDragDistance ||
+                    Math.Abs(ptMouseMove.Y - _mouseDownPoint.Y) > SystemParameters.MinimumVerticalDragDistance)
+                {
+                    UpdateDragDetails();
+                    CaptureMouse();
+                    _isMouseDown = false;
+                }
+            }
+
+            if (IsMouseCaptured)
+            {
+                var mousePosInScreenCoord = this.PointToScreenDPI(e.GetPosition(this));
+                if (!_parentDocumentTabPanelScreenArea.Contains(mousePosInScreenCoord))
+                {
+                    ReleaseMouseCapture();
+                    var manager = Model.Root.Manager;
+                    manager.StartDraggingFloatingWindowForContent(Model);
+                }
+                else
+                {
+                    int indexOfTabItemWithMouseOver = _otherTabsScreenArea.FindIndex(r => r.Contains(mousePosInScreenCoord));
+                    if (indexOfTabItemWithMouseOver >= 0)
+                    {
+                        var targetModel = _otherTabs[indexOfTabItemWithMouseOver].Content as LayoutContent;
+                        var container = Model.Parent as ILayoutContainer;
+                        var containerPane = Model.Parent as ILayoutPane;
+                        var childrenList = container.Children.ToList();
+                        containerPane.MoveChild(childrenList.IndexOf(Model), childrenList.IndexOf(targetModel));
+                        Model.IsActive = true;
+                        _parentDocumentTabPanel.UpdateLayout();
+                        UpdateDragDetails();
+                    }
+                }
+            }
+
+        }
+
+        protected override void OnMouseLeftButtonUp(System.Windows.Input.MouseButtonEventArgs e)
+        {
+            if (IsMouseCaptured)
+                ReleaseMouseCapture();
+            _isMouseDown = false;
+
+            base.OnMouseLeftButtonUp(e);
+        }
+
+        protected override void OnMouseLeave(System.Windows.Input.MouseEventArgs e)
+        {
+            base.OnMouseLeave(e);
+            _isMouseDown = false;
+        }
+
+        protected override void OnMouseEnter(MouseEventArgs e)
+        {
+            base.OnMouseEnter(e);
+            _isMouseDown = false;
+        }
+
+        protected override void OnMouseDown(MouseButtonEventArgs e)
+        {
+            if (e.ChangedButton == MouseButton.Middle)
+            {
+                if (LayoutItem.CloseCommand.CanExecute(null))
+                    LayoutItem.CloseCommand.Execute(null);
+            }
+
+            base.OnMouseDown(e);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
new file mode 100644
index 000000000..b3e9d576d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
@@ -0,0 +1,500 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
+using System.Windows.Input;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Diagnostics;
+using System.Windows.Documents;
+using Xceed.Wpf.AvalonDock.Themes;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public abstract class LayoutFloatingWindowControl : Window, ILayoutControl
+    {
+        static LayoutFloatingWindowControl()
+        {
+            LayoutFloatingWindowControl.ContentProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(null, null, new CoerceValueCallback(CoerceContentValue)));
+            AllowsTransparencyProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
+            ShowInTaskbarProperty.OverrideMetadata(typeof(LayoutFloatingWindowControl), new FrameworkPropertyMetadata(false));
+        } 
+
+        static object CoerceContentValue(DependencyObject sender, object content)
+        {
+            return new FloatingWindowContentHost(sender as LayoutFloatingWindowControl) { Content = content as UIElement };
+        }
+
+        protected class FloatingWindowContentHost : HwndHost
+        {
+            LayoutFloatingWindowControl _owner;
+            public FloatingWindowContentHost(LayoutFloatingWindowControl owner)
+            {
+                _owner = owner;
+                var manager = _owner.Model.Root.Manager;
+            }
+
+
+            HwndSource _wpfContentHost = null;
+            Border _rootPresenter = null;
+            DockingManager _manager = null;
+
+            protected override System.Runtime.InteropServices.HandleRef BuildWindowCore(System.Runtime.InteropServices.HandleRef hwndParent)
+            {
+                _wpfContentHost = new HwndSource(new HwndSourceParameters()
+                {
+                    ParentWindow = hwndParent.Handle,
+                    WindowStyle = Win32Helper.WS_CHILD | Win32Helper.WS_VISIBLE | Win32Helper.WS_CLIPSIBLINGS | Win32Helper.WS_CLIPCHILDREN,
+                    Width = 1,
+                    Height = 1
+                });
+
+                _rootPresenter = new Border() { Child = new AdornerDecorator() { Child = Content }, Focusable = true };
+                _rootPresenter.SetBinding(Border.BackgroundProperty, new Binding("Background") { Source = _owner });
+                _wpfContentHost.RootVisual = _rootPresenter;
+                _wpfContentHost.SizeToContent = SizeToContent.Manual;
+                _manager = _owner.Model.Root.Manager;
+                _manager.InternalAddLogicalChild(_rootPresenter);
+
+                return new HandleRef(this, _wpfContentHost.Handle);
+            }
+
+
+            protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
+            {
+                Trace.WriteLine("FloatingWindowContentHost.GotKeyboardFocus");
+                base.OnGotKeyboardFocus(e);
+            }
+            protected override void DestroyWindowCore(HandleRef hwnd)
+            {
+                _manager.InternalRemoveLogicalChild(_rootPresenter);
+                if (_wpfContentHost != null)
+                {
+                    _wpfContentHost.Dispose();
+                    _wpfContentHost = null;
+                }
+            }
+            protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+            {
+                switch (msg)
+                {
+                    case Win32Helper.WM_SETFOCUS:
+                        Trace.WriteLine("FloatingWindowContentHost.WM_SETFOCUS");
+                        break;
+                    case Win32Helper.WM_KILLFOCUS:
+                        Trace.WriteLine("FloatingWindowContentHost.WM_KILLFOCUS");
+                        break;
+                }                
+                return base.WndProc(hwnd, msg, wParam, lParam, ref handled);
+            }
+
+            public Visual RootVisual
+            {
+                get { return _rootPresenter; }
+            }
+
+            protected override Size MeasureOverride(Size constraint)
+            {
+                if (Content == null)
+                    return base.MeasureOverride(constraint);
+
+                Content.Measure(constraint);
+                return Content.DesiredSize;
+            }
+
+            #region Content
+
+            /// <summary>
+            /// Content Dependency Property
+            /// </summary>
+            public static readonly DependencyProperty ContentProperty =
+                DependencyProperty.Register("Content", typeof(UIElement), typeof(FloatingWindowContentHost),
+                    new FrameworkPropertyMetadata((UIElement)null,
+                        new PropertyChangedCallback(OnContentChanged)));
+
+            /// <summary>
+            /// Gets or sets the Content property.  This dependency property 
+            /// indicates ....
+            /// </summary>
+            public UIElement Content
+            {
+                get { return (UIElement)GetValue(ContentProperty); }
+                set { SetValue(ContentProperty, value); }
+            }
+
+            /// <summary>
+            /// Handles changes to the Content property.
+            /// </summary>
+            private static void OnContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+            {
+                ((FloatingWindowContentHost)d).OnContentChanged(e);
+            }
+
+            /// <summary>
+            /// Provides derived classes an opportunity to handle changes to the Content property.
+            /// </summary>
+            protected virtual void OnContentChanged(DependencyPropertyChangedEventArgs e)
+            {
+                if (_rootPresenter != null)
+                    _rootPresenter.Child = Content;
+            }
+
+            #endregion
+        }
+
+        ILayoutElement _model;
+
+        protected LayoutFloatingWindowControl(ILayoutElement model)
+        {
+            this.Loaded += new RoutedEventHandler(OnLoaded);
+            this.Unloaded += new RoutedEventHandler(OnUnloaded);
+            _model = model;
+            UpdateThemeResources();
+        }
+
+        internal virtual void UpdateThemeResources(Theme oldTheme = null)
+        {
+            if (oldTheme != null)
+            {
+                var resourceDictionaryToRemove =
+                    Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+                if (resourceDictionaryToRemove != null)
+                    Resources.MergedDictionaries.Remove(
+                        resourceDictionaryToRemove);
+            }
+
+            var manager = _model.Root.Manager;
+            if (manager.Theme != null)
+            {
+                Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = manager.Theme.GetResourceUri() });
+            }
+        }
+
+        protected override void OnClosed(EventArgs e)
+        {
+            if (Content != null)
+            {
+                var host = Content as FloatingWindowContentHost;
+                host.Dispose();
+
+                if (_hwndSrc != null)
+                {
+                    _hwndSrc.RemoveHook(_hwndSrcHook);
+                    _hwndSrc.Dispose();
+                    _hwndSrc = null;
+                }
+            }
+
+            base.OnClosed(e);
+        }
+
+        bool _attachDrag = false;
+        internal void AttachDrag(bool onActivated = true)
+        {
+            if (onActivated)
+            {
+                _attachDrag = true;
+                this.Activated += new EventHandler(OnActivated);
+            }
+            else
+            {
+                IntPtr windowHandle = new WindowInteropHelper(this).Handle;
+                IntPtr lParam = new IntPtr(((int)Left & (int)0xFFFF) | (((int)Top) << 16));
+                Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
+            }
+        }
+
+        HwndSource _hwndSrc;
+        HwndSourceHook _hwndSrcHook;
+
+        void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= new RoutedEventHandler(OnLoaded);
+
+            this.SetParentToMainWindowOf(Model.Root.Manager);
+
+
+            _hwndSrc = HwndSource.FromDependencyObject(this) as HwndSource;
+            _hwndSrcHook = new HwndSourceHook(FilterMessage);
+            _hwndSrc.AddHook(_hwndSrcHook);
+        }
+
+        void OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            this.Unloaded -= new RoutedEventHandler(OnUnloaded);
+
+            if (_hwndSrc != null)
+            {
+                _hwndSrc.RemoveHook(_hwndSrcHook);
+                _hwndSrc.Dispose();
+                _hwndSrc = null;
+            }
+        }
+
+        void OnActivated(object sender, EventArgs e)
+        {
+            this.Activated -= new EventHandler(OnActivated);
+
+            if (_attachDrag && Mouse.LeftButton == MouseButtonState.Pressed)
+            {
+                IntPtr windowHandle = new WindowInteropHelper(this).Handle;
+                var mousePosition = this.PointToScreenDPI(Mouse.GetPosition(this));
+                var clientArea = Win32Helper.GetClientRect(windowHandle);
+                var windowArea = Win32Helper.GetWindowRect(windowHandle);
+
+                Left = mousePosition.X - windowArea.Width / 2.0;
+                Top = mousePosition.Y - (windowArea.Height - clientArea.Height) / 2.0;
+                _attachDrag = false;
+
+                IntPtr lParam = new IntPtr(((int)mousePosition.X & (int)0xFFFF) | (((int)mousePosition.Y) << 16));
+                Win32Helper.SendMessage(windowHandle, Win32Helper.WM_NCLBUTTONDOWN, new IntPtr(Win32Helper.HT_CAPTION), lParam);
+            }
+        }
+
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.CloseWindowCommand,
+                new ExecutedRoutedEventHandler((s, args) => Microsoft.Windows.Shell.SystemCommands.CloseWindow((Window)args.Parameter))));
+            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MaximizeWindowCommand,
+                new ExecutedRoutedEventHandler((s, args) => Microsoft.Windows.Shell.SystemCommands.MaximizeWindow((Window)args.Parameter))));
+            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.MinimizeWindowCommand,
+                new ExecutedRoutedEventHandler((s, args) => Microsoft.Windows.Shell.SystemCommands.MinimizeWindow((Window)args.Parameter))));
+            CommandBindings.Add(new CommandBinding(Microsoft.Windows.Shell.SystemCommands.RestoreWindowCommand,
+                new ExecutedRoutedEventHandler((s, args) => Microsoft.Windows.Shell.SystemCommands.RestoreWindow((Window)args.Parameter))));
+            //Debug.Assert(this.Owner != null);
+            base.OnInitialized(e);
+        }
+
+        public abstract ILayoutElement Model { get; }
+
+
+        #region IsDragging
+
+        /// <summary>
+        /// IsDragging Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsDraggingPropertyKey
+            = DependencyProperty.RegisterReadOnly("IsDragging", typeof(bool), typeof(LayoutFloatingWindowControl),
+                new FrameworkPropertyMetadata((bool)false,
+                    new PropertyChangedCallback(OnIsDraggingChanged)));
+
+        public static readonly DependencyProperty IsDraggingProperty
+            = IsDraggingPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsDragging property.  This dependency property 
+        /// indicates that this floating window is being dragged.
+        /// </summary>
+        public bool IsDragging
+        {
+            get { return (bool)GetValue(IsDraggingProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsDragging property.  
+        /// This dependency property indicates that this floating window is being dragged.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsDragging(bool value)
+        {
+            SetValue(IsDraggingPropertyKey, value);
+        }
+
+        /// <summary>
+        /// Handles changes to the IsDragging property.
+        /// </summary>
+        private static void OnIsDraggingChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutFloatingWindowControl)d).OnIsDraggingChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IsDragging property.
+        /// </summary>
+        protected virtual void OnIsDraggingChanged(DependencyPropertyChangedEventArgs e)
+        {
+          //Trace.WriteLine("IsDragging={0}", e.NewValue);
+        }
+
+        #endregion
+
+
+
+        DragService _dragService = null;
+
+        void UpdatePositionAndSizeOfPanes()
+        {
+            foreach (var posElement in Model.Descendents().OfType<ILayoutElementForFloatingWindow>())
+            {
+                posElement.FloatingLeft = Left;
+                posElement.FloatingTop = Top;
+                posElement.FloatingWidth = Width;
+                posElement.FloatingHeight = Height;
+                posElement.IsMaximized = this.WindowState == System.Windows.WindowState.Maximized;
+            }
+        }
+
+        protected virtual IntPtr FilterMessage(
+            IntPtr hwnd,
+            int msg,
+            IntPtr wParam,
+            IntPtr lParam,
+            ref bool handled
+            )
+        {
+            handled = false;
+
+            switch (msg)
+            {
+                case Win32Helper.WM_ACTIVATE:
+                    if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
+                    {
+                        if (lParam == this.GetParentWindowHandle())
+                        {
+                            Win32Helper.SetActiveWindow(_hwndSrc.Handle);
+                            handled = true;
+                        }
+                    }
+                    break;
+                case Win32Helper.WM_EXITSIZEMOVE:
+                    UpdatePositionAndSizeOfPanes();
+
+                    if (_dragService != null)
+                    {
+                        bool dropFlag;
+                        var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
+                        _dragService.Drop(mousePosition, out dropFlag);
+                        _dragService = null;
+                        SetIsDragging(false);
+
+                        if (dropFlag)
+                            InternalClose();
+                    }
+
+                    break;
+                case Win32Helper.WM_MOVING:
+                    {
+                        UpdateDragPosition();
+                    }
+                    break;
+                case Win32Helper.WM_LBUTTONUP: //set as handled right button click on title area (after showing context menu)
+                    if (_dragService != null && Mouse.LeftButton == MouseButtonState.Released)
+                    {
+                        _dragService.Abort();
+                        _dragService = null;
+                        SetIsDragging(false);
+                    }
+                    break;
+            }
+
+
+
+            return IntPtr.Zero;
+        }
+
+        private void UpdateDragPosition()
+        {
+            if (_dragService == null)
+            {
+                _dragService = new DragService(this);
+                SetIsDragging(true);
+            }
+
+            var mousePosition = this.TransformToDeviceDPI(Win32Helper.GetMousePosition());
+            _dragService.UpdateMouseLocation(mousePosition);
+        }
+
+        bool _internalCloseFlag = false;
+
+        internal void InternalClose()
+        {
+            _internalCloseFlag = true;
+            Close();
+        }
+
+
+        protected bool CloseInitiatedByUser
+        {
+            get { return !_internalCloseFlag; }
+        }
+
+        internal bool KeepContentVisibleOnClose
+        {
+            get;
+            set;
+        }
+
+        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+        {
+            base.OnMouseLeftButtonUp(e);
+        }
+
+        #region IsMaximized
+
+        /// <summary>
+        /// IsMaximized Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey IsMaximizedPropertyKey
+            = DependencyProperty.RegisterReadOnly("IsMaximized", typeof(bool), typeof(LayoutFloatingWindowControl),
+                new FrameworkPropertyMetadata((bool)false));
+
+        public static readonly DependencyProperty IsMaximizedProperty
+            = IsMaximizedPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the IsMaximized property.  This dependency property 
+        /// indicates if the window is maximized.
+        /// </summary>
+        public bool IsMaximized
+        {
+            get { return (bool)GetValue(IsMaximizedProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the IsMaximized property.  
+        /// This dependency property indicates if the window is maximized.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetIsMaximized(bool value)
+        {
+            SetValue(IsMaximizedPropertyKey, value);
+        }
+
+        protected override void OnStateChanged(EventArgs e)
+        {
+            SetIsMaximized(WindowState == System.Windows.WindowState.Maximized);
+            base.OnStateChanged(e);
+        }
+
+        #endregion
+
+
+
+
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
new file mode 100644
index 000000000..c70b179b4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
@@ -0,0 +1,563 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Input;
+using System.Windows.Media;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Diagnostics;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public abstract class LayoutGridControl<T> : Grid, ILayoutControl where T : class, ILayoutPanelElement
+    {
+        static LayoutGridControl()
+        {
+        }
+
+        internal LayoutGridControl(LayoutPositionableGroup<T> model, Orientation orientation)
+        {
+            if (model == null)
+                throw new ArgumentNullException("model");
+
+            _model = model;
+            _orientation = orientation;
+
+            FlowDirection = System.Windows.FlowDirection.LeftToRight;
+        }
+
+        LayoutPositionableGroup<T> _model;
+        public ILayoutElement Model
+        {
+            get { return _model; }
+        }
+
+        Orientation _orientation;
+
+        public Orientation Orientation
+        {
+            get { return (_model as ILayoutOrientableGroup).Orientation; }
+        }
+
+        bool _initialized;
+        ChildrenTreeChange? _asyncRefreshCalled;
+
+        bool AsyncRefreshCalled
+        {
+            get { return _asyncRefreshCalled != null; }
+        }
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            _model.ChildrenTreeChanged += (s, args) =>
+                {
+                    if (_asyncRefreshCalled.HasValue &&
+                        _asyncRefreshCalled.Value == args.Change)
+                        return;
+                    _asyncRefreshCalled = args.Change;
+                    Dispatcher.BeginInvoke(new Action(() =>
+                        {
+                            _asyncRefreshCalled = null;
+                            UpdateChildren();
+                        }), DispatcherPriority.Normal, null);
+                };
+
+            this.LayoutUpdated += new EventHandler(OnLayoutUpdated);
+        }
+
+        void OnLayoutUpdated(object sender, EventArgs e)
+        {
+            var modelWithAtcualSize = _model as ILayoutPositionableElementWithActualSize;
+            modelWithAtcualSize.ActualWidth = ActualWidth;
+            modelWithAtcualSize.ActualHeight = ActualHeight;
+
+            if (!_initialized)
+            {
+                _initialized = true;
+                UpdateChildren();
+            }
+        }
+
+        void UpdateChildren()
+        {
+            var alreadyContainedChildren = Children.OfType<ILayoutControl>().ToArray();
+
+            DetachOldSplitters();
+            DetachPropertChangeHandler();
+
+            Children.Clear();
+            ColumnDefinitions.Clear();
+            RowDefinitions.Clear();
+
+            if (_model == null ||
+                _model.Root == null)
+                return;
+
+            var manager = _model.Root.Manager;
+            if (manager == null)
+                return;
+
+
+            foreach (ILayoutElement child in _model.Children)
+            {
+                var foundContainedChild = alreadyContainedChildren.FirstOrDefault(chVM => chVM.Model == child);
+                if (foundContainedChild != null)
+                    Children.Add(foundContainedChild as UIElement);
+                else
+                    Children.Add(manager.CreateUIElementForModel(child));
+            }
+
+            CreateSplitters();
+
+            UpdateRowColDefinitions();
+
+            AttachNewSplitters();
+            AttachPropertyChangeHandler();
+        }
+
+        private void AttachPropertyChangeHandler()
+        {
+            foreach (var child in InternalChildren.OfType<ILayoutControl>())
+            {
+                child.Model.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(this.OnChildModelPropertyChanged);
+            }
+        }
+
+        private void DetachPropertChangeHandler()
+        {
+            foreach (var child in InternalChildren.OfType<ILayoutControl>())
+            {
+                child.Model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler(this.OnChildModelPropertyChanged);
+            }
+        }
+
+        void OnChildModelPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+        {
+            if (AsyncRefreshCalled)
+                return;
+
+            if (_fixingChildrenDockLengths.CanEnter && e.PropertyName == "DockWidth" && Orientation == System.Windows.Controls.Orientation.Horizontal)
+            {
+                if (ColumnDefinitions.Count == InternalChildren.Count)
+                {
+                    var changedElement = sender as ILayoutPositionableElement;
+                    var childFromModel = InternalChildren.OfType<ILayoutControl>().First(ch => ch.Model == changedElement) as UIElement;
+                    int indexOfChild = InternalChildren.IndexOf(childFromModel);
+                    ColumnDefinitions[indexOfChild].Width = changedElement.DockWidth;
+                }
+            }
+            else if (_fixingChildrenDockLengths.CanEnter && e.PropertyName == "DockHeight" && Orientation == System.Windows.Controls.Orientation.Vertical)
+            {
+                if (RowDefinitions.Count == InternalChildren.Count)
+                {
+                    var changedElement = sender as ILayoutPositionableElement;
+                    var childFromModel = InternalChildren.OfType<ILayoutControl>().First(ch => ch.Model == changedElement) as UIElement;
+                    int indexOfChild = InternalChildren.IndexOf(childFromModel);
+                    RowDefinitions[indexOfChild].Height = changedElement.DockHeight;
+                }
+            }
+            else if (e.PropertyName == "IsVisible")
+            {
+                UpdateRowColDefinitions();
+            }
+        }
+
+
+        void UpdateRowColDefinitions()
+        {
+            var root = _model.Root;
+            if (root == null)
+                return;
+            var manager = root.Manager;
+            if (manager == null)
+                return;
+
+            FixChildrenDockLengths();
+
+            //Debug.Assert(InternalChildren.Count == _model.ChildrenCount + (_model.ChildrenCount - 1));
+
+            #region Setup GridRows/Cols
+            RowDefinitions.Clear();
+            ColumnDefinitions.Clear();
+            if (Orientation == Orientation.Horizontal)
+            {
+                int iColumn = 0;
+                int iChild = 0;
+                for (int iChildModel = 0; iChildModel < _model.Children.Count; iChildModel++, iColumn++, iChild++)
+                {
+                    var childModel = _model.Children[iChildModel] as ILayoutPositionableElement;
+                    ColumnDefinitions.Add(new ColumnDefinition()
+                    {
+                        Width = childModel.IsVisible ? childModel.DockWidth : new GridLength(0.0, GridUnitType.Pixel),
+                        MinWidth = childModel.IsVisible ? childModel.DockMinWidth : 0.0
+                    });
+                    Grid.SetColumn(InternalChildren[iChild], iColumn);
+
+                    //append column for splitter
+                    if (iChild < InternalChildren.Count - 1)
+                    {
+                        iChild++;
+                        iColumn++;
+
+                        bool nextChildModelVisibleExist = false;
+                        for (int i = iChildModel + 1; i < _model.Children.Count; i++)
+                        {
+                            var nextChildModel = _model.Children[i] as ILayoutPositionableElement;
+                            if (nextChildModel.IsVisible)
+                            {
+                                nextChildModelVisibleExist = true;
+                                break;
+                            }
+                        }
+
+                        ColumnDefinitions.Add(new ColumnDefinition()
+                        {
+                            Width = childModel.IsVisible && nextChildModelVisibleExist ? new GridLength(manager.GridSplitterWidth) : new GridLength(0.0, GridUnitType.Pixel)
+                        });
+                        Grid.SetColumn(InternalChildren[iChild], iColumn);
+                    }
+                }
+            }
+            else //if (_model.Orientation == Orientation.Vertical)
+            {
+                int iRow = 0;
+                int iChild = 0;
+                for (int iChildModel = 0; iChildModel < _model.Children.Count; iChildModel++, iRow++, iChild++)
+                {
+                    var childModel = _model.Children[iChildModel] as ILayoutPositionableElement;
+                    RowDefinitions.Add(new RowDefinition()
+                    {
+                        Height = childModel.IsVisible ? childModel.DockHeight : new GridLength(0.0, GridUnitType.Pixel),
+                        MinHeight = childModel.IsVisible ? childModel.DockMinHeight : 0.0
+                    });
+                    Grid.SetRow(InternalChildren[iChild], iRow);
+
+                    //if (RowDefinitions.Last().Height.Value == 0.0)
+                    //    System.Diagnostics.Debugger.Break();
+
+                    //append row for splitter (if necessary)
+                    if (iChild < InternalChildren.Count - 1)
+                    {
+                        iChild++;
+                        iRow++;
+
+                        bool nextChildModelVisibleExist = false;
+                        for (int i = iChildModel + 1; i < _model.Children.Count; i++)
+                        {
+                            var nextChildModel = _model.Children[i] as ILayoutPositionableElement;
+                            if (nextChildModel.IsVisible)
+                            {
+                                nextChildModelVisibleExist = true;
+                                break;
+                            }
+                        }
+
+                        RowDefinitions.Add(new RowDefinition()
+                        {
+                            Height = childModel.IsVisible && nextChildModelVisibleExist ? new GridLength(manager.GridSplitterHeight) : new GridLength(0.0, GridUnitType.Pixel)
+                        });
+                        //if (RowDefinitions.Last().Height.Value == 0.0)
+                        //    System.Diagnostics.Debugger.Break();
+                        Grid.SetRow(InternalChildren[iChild], iRow);
+                    }
+                }
+            }
+
+            #endregion
+        }
+
+        ReentrantFlag _fixingChildrenDockLengths = new ReentrantFlag();
+        protected void FixChildrenDockLengths()
+        {
+            using (_fixingChildrenDockLengths.Enter())
+                OnFixChildrenDockLengths();
+        }
+
+        protected abstract void OnFixChildrenDockLengths();
+
+        #region Splitters
+
+        void CreateSplitters()
+        {
+            for (int iChild = 1; iChild < Children.Count; iChild++)
+            {
+                var splitter = new LayoutGridResizerControl();
+                splitter.Cursor = this.Orientation == Orientation.Horizontal ? Cursors.SizeWE : Cursors.SizeNS;
+                Children.Insert(iChild, splitter);
+                iChild++;
+            }
+        }
+
+        void DetachOldSplitters()
+        {
+            foreach (var splitter in Children.OfType<LayoutGridResizerControl>())
+            {
+                splitter.DragStarted -= new System.Windows.Controls.Primitives.DragStartedEventHandler(OnSplitterDragStarted);
+                splitter.DragDelta -= new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnSplitterDragDelta);
+                splitter.DragCompleted -= new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnSplitterDragCompleted);
+            }
+        }
+
+        void AttachNewSplitters()
+        {
+            foreach (var splitter in Children.OfType<LayoutGridResizerControl>())
+            {
+                splitter.DragStarted += new System.Windows.Controls.Primitives.DragStartedEventHandler(OnSplitterDragStarted);
+                splitter.DragDelta += new System.Windows.Controls.Primitives.DragDeltaEventHandler(OnSplitterDragDelta);
+                splitter.DragCompleted += new System.Windows.Controls.Primitives.DragCompletedEventHandler(OnSplitterDragCompleted);
+            }
+        }
+
+        void OnSplitterDragStarted(object sender, System.Windows.Controls.Primitives.DragStartedEventArgs e)
+        {
+            var resizer = sender as LayoutGridResizerControl;
+            ShowResizerOverlayWindow(resizer);
+        }
+
+        void OnSplitterDragDelta(object sender, System.Windows.Controls.Primitives.DragDeltaEventArgs e)
+        {
+            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+            var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+            var trToWnd = TransformToAncestor(rootVisual);
+            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
+                trToWnd.Transform(new Point());
+
+            if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+            {
+                Canvas.SetLeft(_resizerGhost, MathHelper.MinMax(_initialStartPoint.X + transformedDelta.X, 0.0, _resizerWindowHost.Width - _resizerGhost.Width));
+            }
+            else
+            {
+                Canvas.SetTop(_resizerGhost, MathHelper.MinMax(_initialStartPoint.Y + transformedDelta.Y, 0.0, _resizerWindowHost.Height - _resizerGhost.Height));
+            }
+        }
+
+        void OnSplitterDragCompleted(object sender, System.Windows.Controls.Primitives.DragCompletedEventArgs e)
+        {
+            LayoutGridResizerControl splitter = sender as LayoutGridResizerControl;
+            var rootVisual = this.FindVisualTreeRoot() as Visual;
+
+            var trToWnd = TransformToAncestor(rootVisual);
+            Vector transformedDelta = trToWnd.Transform(new Point(e.HorizontalChange, e.VerticalChange)) -
+                trToWnd.Transform(new Point());
+
+            double delta;
+            if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+                delta = Canvas.GetLeft(_resizerGhost) - _initialStartPoint.X;
+            else
+                delta = Canvas.GetTop(_resizerGhost) - _initialStartPoint.Y;
+
+            int indexOfResizer = InternalChildren.IndexOf(splitter);
+
+            var prevChild = InternalChildren[indexOfResizer - 1] as FrameworkElement;
+            var nextChild = GetNextVisibleChild(indexOfResizer);
+
+            var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
+            var nextChildActualSize = nextChild.TransformActualSizeToAncestor();
+
+            var prevChildModel = (ILayoutPositionableElement)(prevChild as ILayoutControl).Model;
+            var nextChildModel = (ILayoutPositionableElement)(nextChild as ILayoutControl).Model;
+
+            if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+            {
+              //Trace.WriteLine(string.Format("PrevChild From {0}", prevChildModel.DockWidth));
+                if (prevChildModel.DockWidth.IsStar)
+                {
+                    prevChildModel.DockWidth = new GridLength(prevChildModel.DockWidth.Value * (prevChildActualSize.Width + delta) / prevChildActualSize.Width, GridUnitType.Star);
+                }
+                else
+                {
+                    prevChildModel.DockWidth = new GridLength(prevChildModel.DockWidth.Value + delta, GridUnitType.Pixel);
+                }
+                //Trace.WriteLine(string.Format("PrevChild To {0}", prevChildModel.DockWidth));
+
+                //Trace.WriteLine(string.Format("NextChild From {0}", nextChildModel.DockWidth));
+                if (nextChildModel.DockWidth.IsStar)
+                {
+                    nextChildModel.DockWidth = new GridLength(nextChildModel.DockWidth.Value * (nextChildActualSize.Width - delta) / nextChildActualSize.Width, GridUnitType.Star);
+                }
+                else
+                {
+                    nextChildModel.DockWidth = new GridLength(nextChildModel.DockWidth.Value - delta, GridUnitType.Pixel);
+                }
+              //Trace.WriteLine(string.Format("NextChild To {0}", nextChildModel.DockWidth));
+            }
+            else
+            {
+              //Trace.WriteLine(string.Format("PrevChild From {0}", prevChildModel.DockHeight));
+                if (prevChildModel.DockHeight.IsStar)
+                {
+                    prevChildModel.DockHeight = new GridLength(prevChildModel.DockHeight.Value * (prevChildActualSize.Height + delta) / prevChildActualSize.Height, GridUnitType.Star);
+                }
+                else
+                {
+                    prevChildModel.DockHeight = new GridLength(prevChildModel.DockHeight.Value + delta, GridUnitType.Pixel);
+                }
+                //Trace.WriteLine(string.Format("PrevChild To {0}", prevChildModel.DockHeight));
+
+                //Trace.WriteLine(string.Format("NextChild From {0}", nextChildModel.DockHeight));
+                if (nextChildModel.DockHeight.IsStar)
+                {
+                    nextChildModel.DockHeight = new GridLength(nextChildModel.DockHeight.Value * (nextChildActualSize.Height - delta) / nextChildActualSize.Height, GridUnitType.Star);
+                }
+                else
+                {
+                    nextChildModel.DockHeight = new GridLength(nextChildModel.DockHeight.Value - delta, GridUnitType.Pixel);
+                }
+              //Trace.WriteLine(string.Format("NextChild To {0}", nextChildModel.DockHeight));
+            }
+
+            HideResizerOverlayWindow();
+        }
+
+        Border _resizerGhost = null;
+        Window _resizerWindowHost = null;
+        Vector _initialStartPoint;
+
+        FrameworkElement GetNextVisibleChild(int index)
+        {
+            for (int i = index + 1; i < InternalChildren.Count; i++)
+            {
+                if (InternalChildren[i] is LayoutGridResizerControl)
+                    continue;
+
+                if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+                {
+                    if (ColumnDefinitions[i].Width.IsStar || ColumnDefinitions[i].Width.Value > 0)
+                        return InternalChildren[i] as FrameworkElement;
+                }
+                else
+                {
+                    if (RowDefinitions[i].Height.IsStar || RowDefinitions[i].Height.Value > 0)
+                        return InternalChildren[i] as FrameworkElement;
+                }
+            }
+
+            return null;
+        }
+
+        void ShowResizerOverlayWindow(LayoutGridResizerControl splitter)
+        {
+            _resizerGhost = new Border()
+            {
+                Background = splitter.BackgroundWhileDragging,
+                Opacity = splitter.OpacityWhileDragging
+            };
+
+            int indexOfResizer = InternalChildren.IndexOf(splitter);
+
+            var prevChild = InternalChildren[indexOfResizer - 1] as FrameworkElement;
+            var nextChild = GetNextVisibleChild(indexOfResizer);
+
+            var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
+            var nextChildActualSize = nextChild.TransformActualSizeToAncestor();
+
+            var prevChildModel = (ILayoutPositionableElement)(prevChild as ILayoutControl).Model;
+            var nextChildModel = (ILayoutPositionableElement)(nextChild as ILayoutControl).Model;
+
+            Point ptTopLeftScreen = prevChild.PointToScreenDPIWithoutFlowDirection(new Point());
+
+            Size actualSize;
+
+            if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+            {
+                actualSize = new Size(
+                    prevChildActualSize.Width - prevChildModel.DockMinWidth + splitter.ActualWidth + nextChildActualSize.Width - nextChildModel.DockMinWidth,
+                    nextChildActualSize.Height);
+
+                _resizerGhost.Width = splitter.ActualWidth;
+                _resizerGhost.Height = actualSize.Height;
+                ptTopLeftScreen.Offset(prevChildModel.DockMinWidth, 0.0);
+            }
+            else
+            {
+                actualSize = new Size(
+                    prevChildActualSize.Width,
+                    prevChildActualSize.Height - prevChildModel.DockMinHeight + splitter.ActualHeight + nextChildActualSize.Height - nextChildModel.DockMinHeight);
+
+                _resizerGhost.Height = splitter.ActualHeight;
+                _resizerGhost.Width = actualSize.Width;
+
+                ptTopLeftScreen.Offset(0.0, prevChildModel.DockMinHeight);
+            }
+
+            _initialStartPoint = splitter.PointToScreenDPIWithoutFlowDirection(new Point()) - ptTopLeftScreen;
+
+            if (Orientation == System.Windows.Controls.Orientation.Horizontal)
+            {
+                Canvas.SetLeft(_resizerGhost, _initialStartPoint.X);
+            }
+            else
+            {
+                Canvas.SetTop(_resizerGhost, _initialStartPoint.Y);
+            }
+
+            Canvas panelHostResizer = new Canvas()
+            {
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Stretch,
+                VerticalAlignment = System.Windows.VerticalAlignment.Stretch
+            };
+
+            panelHostResizer.Children.Add(_resizerGhost);
+
+
+            _resizerWindowHost = new Window()
+            {
+                ResizeMode = ResizeMode.NoResize,
+                WindowStyle = System.Windows.WindowStyle.None,
+                ShowInTaskbar = false,
+                AllowsTransparency = true,
+                Background = null,
+                Width = actualSize.Width,
+                Height = actualSize.Height,
+                Left = ptTopLeftScreen.X,
+                Top = ptTopLeftScreen.Y,
+                ShowActivated = false,
+                //Owner = Window.GetWindow(this),
+                Content = panelHostResizer
+            };
+            _resizerWindowHost.Loaded += (s, e) =>
+                {
+                    _resizerWindowHost.SetParentToMainWindowOf(this);
+                };
+            _resizerWindowHost.Show();
+        }
+
+        void HideResizerOverlayWindow()
+        {
+            if (_resizerWindowHost != null)
+            {
+                _resizerWindowHost.Close();
+                _resizerWindowHost = null;
+            }
+        }
+
+        #endregion
+
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
new file mode 100644
index 000000000..709f6c471
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
@@ -0,0 +1,83 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls.Primitives;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutGridResizerControl : Thumb
+    {
+        static LayoutGridResizerControl()
+        {
+            //This OverrideMetadata call tells the system that this element wants to provide a style that is different than its base class.
+            //This style is defined in themes\generic.xaml
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(LayoutGridResizerControl), new FrameworkPropertyMetadata(typeof(LayoutGridResizerControl)));
+            HorizontalAlignmentProperty.OverrideMetadata(typeof(LayoutGridResizerControl), new FrameworkPropertyMetadata(HorizontalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsParentMeasure));
+            VerticalAlignmentProperty.OverrideMetadata(typeof(LayoutGridResizerControl), new FrameworkPropertyMetadata(VerticalAlignment.Stretch, FrameworkPropertyMetadataOptions.AffectsParentMeasure));
+            BackgroundProperty.OverrideMetadata(typeof(LayoutGridResizerControl), new FrameworkPropertyMetadata(Brushes.Transparent));
+            IsHitTestVisibleProperty.OverrideMetadata(typeof(LayoutGridResizerControl), new FrameworkPropertyMetadata(true, null));
+        }
+
+
+        #region BackgroundWhileDragging
+
+        /// <summary>
+        /// BackgroundWhileDragging Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty BackgroundWhileDraggingProperty =
+            DependencyProperty.Register("BackgroundWhileDragging", typeof(Brush), typeof(LayoutGridResizerControl),
+                new FrameworkPropertyMetadata((Brush)Brushes.Black));
+
+        /// <summary>
+        /// Gets or sets the BackgroundWhileDragging property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public Brush BackgroundWhileDragging
+        {
+            get { return (Brush)GetValue(BackgroundWhileDraggingProperty); }
+            set { SetValue(BackgroundWhileDraggingProperty, value); }
+        }
+
+        #endregion
+
+        #region OpacityWhileDragging
+
+        /// <summary>
+        /// OpacityWhileDragging Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty OpacityWhileDraggingProperty =
+            DependencyProperty.Register("OpacityWhileDragging", typeof(double), typeof(LayoutGridResizerControl),
+                new FrameworkPropertyMetadata((double)0.5));
+
+        /// <summary>
+        /// Gets or sets the OpacityWhileDragging property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public double OpacityWhileDragging
+        {
+            get { return (double)GetValue(OpacityWhileDraggingProperty); }
+            set { SetValue(OpacityWhileDraggingProperty, value); }
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
new file mode 100644
index 000000000..2b19c27d9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
@@ -0,0 +1,1094 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Commands;
+using System.ComponentModel;
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public abstract class LayoutItem : FrameworkElement
+    {
+        static LayoutItem()
+        { 
+            ToolTipProperty.OverrideMetadata(typeof(LayoutItem), new FrameworkPropertyMetadata(null, (s, e) => OnToolTipChanged(s,e)));
+            VisibilityProperty.OverrideMetadata(typeof(LayoutItem), new FrameworkPropertyMetadata(Visibility.Visible, (s,e) => OnVisibilityChanged(s, e)));
+        }
+
+
+        internal LayoutItem()
+        {
+
+        }
+
+        internal virtual void Attach(LayoutContent model)
+        { 
+            LayoutElement = model;
+            Model = model.Content;
+
+            InitDefaultCommands();
+
+            LayoutElement.IsSelectedChanged+=new EventHandler(LayoutElement_IsSelectedChanged);
+            LayoutElement.IsActiveChanged+=new EventHandler(LayoutElement_IsActiveChanged);
+
+            DataContext = this;
+            System.Diagnostics.Trace.WriteLine( string.Format( "Attach({0})", LayoutElement.Title ) );
+        }
+
+
+
+        void LayoutElement_IsActiveChanged(object sender, EventArgs e)
+        {
+            if (_isActiveReentrantFlag.CanEnter)
+            {
+                using (_isActiveReentrantFlag.Enter())
+                {
+                    var bnd = BindingOperations.GetBinding(this, IsActiveProperty);
+                    IsActive = LayoutElement.IsActive;
+                    var bnd2 = BindingOperations.GetBinding(this, IsActiveProperty);
+                }
+            }
+        }
+
+        void LayoutElement_IsSelectedChanged(object sender, EventArgs e)
+        {
+            if (_isSelectedReentrantFlag.CanEnter)
+            {
+                using (_isSelectedReentrantFlag.Enter())
+                {
+                    IsSelected = LayoutElement.IsSelected;
+                }
+            }
+        }
+
+        internal virtual void Detach()
+        {
+          System.Diagnostics.Trace.WriteLine( string.Format( "Detach({0})", LayoutElement.Title ) );
+            LayoutElement.IsSelectedChanged -= new EventHandler(LayoutElement_IsSelectedChanged);
+            LayoutElement.IsActiveChanged -= new EventHandler(LayoutElement_IsActiveChanged);
+            LayoutElement = null;
+            Model = null;
+        }
+
+        public LayoutContent LayoutElement
+        {
+            get;
+            private set;
+        }
+
+        public object Model
+        {
+            get;
+            private set;
+        }
+
+        ICommand _defaultCloseCommand;
+        ICommand _defaultFloatCommand;
+        ICommand _defaultDockAsDocumentCommand;
+        ICommand _defaultCloseAllButThisCommand;
+        ICommand _defaultActivateCommand;
+        ICommand _defaultNewVerticalTabGroupCommand;
+        ICommand _defaultNewHorizontalTabGroupCommand;
+        ICommand _defaultMoveToNextTabGroupCommand;
+        ICommand _defaultMoveToPreviousTabGroupCommand;
+
+        protected virtual void InitDefaultCommands()
+        {
+            _defaultCloseCommand = new RelayCommand((p) => ExecuteCloseCommand(p), (p) => CanExecuteCloseCommand(p));
+            _defaultFloatCommand = new RelayCommand((p) => ExecuteFloatCommand(p), (p) => CanExecuteFloatCommand(p));
+            _defaultDockAsDocumentCommand = new RelayCommand((p) => ExecuteDockAsDocumentCommand(p), (p) => CanExecuteDockAsDocumentCommand(p));
+            _defaultCloseAllButThisCommand = new RelayCommand((p) => ExecuteCloseAllButThisCommand(p), (p) => CanExecuteCloseAllButThisCommand(p));
+            _defaultActivateCommand = new RelayCommand((p) => ExecuteActivateCommand(p), (p) => CanExecuteActivateCommand(p));
+            _defaultNewVerticalTabGroupCommand = new RelayCommand((p) => ExecuteNewVerticalTabGroupCommand(p), (p) => CanExecuteNewVerticalTabGroupCommand(p));
+            _defaultNewHorizontalTabGroupCommand = new RelayCommand((p) => ExecuteNewHorizontalTabGroupCommand(p), (p) => CanExecuteNewHorizontalTabGroupCommand(p));
+            _defaultMoveToNextTabGroupCommand = new RelayCommand((p) => ExecuteMoveToNextTabGroupCommand(p), (p) => CanExecuteMoveToNextTabGroupCommand(p));
+            _defaultMoveToPreviousTabGroupCommand = new RelayCommand((p) => ExecuteMoveToPreviousTabGroupCommand(p), (p) => CanExecuteMoveToPreviousTabGroupCommand(p));
+        }
+
+        protected virtual void ClearDefaultBindings()
+        {
+            if (CloseCommand == _defaultCloseCommand)
+                BindingOperations.ClearBinding(this, CloseCommandProperty);
+            if (FloatCommand == _defaultFloatCommand)
+                BindingOperations.ClearBinding(this, FloatCommandProperty);
+            if (DockAsDocumentCommand == _defaultDockAsDocumentCommand)
+                BindingOperations.ClearBinding(this, DockAsDocumentCommandProperty);
+            if (CloseAllButThisCommand == _defaultCloseAllButThisCommand)
+                BindingOperations.ClearBinding(this, CloseAllButThisCommandProperty);
+            if (ActivateCommand == _defaultActivateCommand)
+                BindingOperations.ClearBinding(this, ActivateCommandProperty);
+            if (NewVerticalTabGroupCommand == _defaultNewVerticalTabGroupCommand)
+                BindingOperations.ClearBinding(this, NewVerticalTabGroupCommandProperty);
+            if (NewHorizontalTabGroupCommand == _defaultNewHorizontalTabGroupCommand)
+                BindingOperations.ClearBinding(this, NewHorizontalTabGroupCommandProperty);
+            if (MoveToNextTabGroupCommand == _defaultMoveToNextTabGroupCommand)
+                BindingOperations.ClearBinding(this, MoveToNextTabGroupCommandProperty);
+            if (MoveToPreviousTabGroupCommand == _defaultMoveToPreviousTabGroupCommand)
+                BindingOperations.ClearBinding(this, MoveToPreviousTabGroupCommandProperty);
+        }
+
+        protected virtual void SetDefaultBindings()
+        {
+            if (CloseCommand == null)
+                CloseCommand = _defaultCloseCommand;
+            if (FloatCommand == null)
+                FloatCommand = _defaultFloatCommand;
+            if (DockAsDocumentCommand == null)
+                DockAsDocumentCommand = _defaultDockAsDocumentCommand;
+            if (CloseAllButThisCommand == null)
+                CloseAllButThisCommand = _defaultCloseAllButThisCommand;
+            if (ActivateCommand == null)
+                ActivateCommand = _defaultActivateCommand;
+            if (NewVerticalTabGroupCommand == null)
+                NewVerticalTabGroupCommand = _defaultNewVerticalTabGroupCommand;
+            if (NewHorizontalTabGroupCommand == null)
+                NewHorizontalTabGroupCommand = _defaultNewHorizontalTabGroupCommand;
+            if (MoveToNextTabGroupCommand == null)
+                MoveToNextTabGroupCommand = _defaultMoveToNextTabGroupCommand;
+            if (MoveToPreviousTabGroupCommand == null)
+                MoveToPreviousTabGroupCommand = _defaultMoveToPreviousTabGroupCommand;
+
+
+            IsSelected = LayoutElement.IsSelected;
+            IsActive = LayoutElement.IsActive;
+        }
+
+        internal void _ClearDefaultBindings()
+        {
+            ClearDefaultBindings();
+        }
+
+        internal void _SetDefaultBindings()
+        {
+            SetDefaultBindings();
+        }
+
+        ContentPresenter _view = null;
+        public ContentPresenter View
+        {
+            get
+            {
+                if (_view == null)
+                {
+                    _view = new ContentPresenter();
+
+                    _view.SetBinding(ContentPresenter.ContentProperty, new Binding("Content") { Source = LayoutElement });
+                    _view.SetBinding(ContentPresenter.ContentTemplateProperty, new Binding("LayoutItemTemplate") { Source =  LayoutElement.Root.Manager});
+                    _view.SetBinding(ContentPresenter.ContentTemplateSelectorProperty, new Binding("LayoutItemTemplateSelector") { Source = LayoutElement.Root.Manager });
+                    LayoutElement.Root.Manager.InternalAddLogicalChild(_view);
+                }
+
+                return _view;
+            }
+        }
+
+
+        #region Title
+
+        /// <summary>
+        /// Title Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty TitleProperty =
+            DependencyProperty.Register("Title", typeof(string), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((string)null,
+                    new PropertyChangedCallback(OnTitleChanged)));
+
+        /// <summary>
+        /// Gets or sets the Title property.  This dependency property 
+        /// indicates the title of the element.
+        /// </summary>
+        public string Title
+        {
+            get { return (string)GetValue(TitleProperty); }
+            set { SetValue(TitleProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Title property.
+        /// </summary>
+        private static void OnTitleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnTitleChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Title property.
+        /// </summary>
+        protected virtual void OnTitleChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (LayoutElement != null)
+                LayoutElement.Title = (string)e.NewValue;
+        }
+
+        #endregion
+
+        #region ToolTip
+        private static void OnToolTipChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)s).OnToolTipChanged();
+        }
+
+        private void OnToolTipChanged()
+        {
+            if (LayoutElement != null)
+                LayoutElement.ToolTip = ToolTip;
+        }
+        #endregion
+
+        #region IconSource
+
+        /// <summary>
+        /// IconSource Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IconSourceProperty =
+            DependencyProperty.Register("IconSource", typeof(ImageSource), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((ImageSource)null,
+                    new PropertyChangedCallback(OnIconSourceChanged)));
+
+        /// <summary>
+        /// Gets or sets the IconSource property.  This dependency property 
+        /// indicates icon associated with the item.
+        /// </summary>
+        public ImageSource IconSource
+        {
+            get { return (ImageSource)GetValue(IconSourceProperty); }
+            set { SetValue(IconSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the IconSource property.
+        /// </summary>
+        private static void OnIconSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnIconSourceChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IconSource property.
+        /// </summary>
+        protected virtual void OnIconSourceChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (LayoutElement != null)
+                LayoutElement.IconSource = IconSource;
+        }
+
+        #endregion
+
+        #region Visibility
+
+        private static void OnVisibilityChanged(DependencyObject s, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)s).OnVisibilityChanged();
+        }
+
+        protected virtual void OnVisibilityChanged()
+        {
+            if (LayoutElement != null &&
+                Visibility == System.Windows.Visibility.Collapsed)
+                LayoutElement.Close();
+        }
+
+        #endregion
+
+        #region ContentId
+
+        /// <summary>
+        /// ContentId Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ContentIdProperty =
+            DependencyProperty.Register("ContentId", typeof(string), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((string)null,
+                    new PropertyChangedCallback(OnContentIdChanged)));
+
+        /// <summary>
+        /// Gets or sets the ContentId property.  This dependency property 
+        /// indicates the content id used to retrive content when deserializing layouts.
+        /// </summary>
+        public string ContentId
+        {
+            get { return (string)GetValue(ContentIdProperty); }
+            set { SetValue(ContentIdProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the ContentId property.
+        /// </summary>
+        private static void OnContentIdChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnContentIdChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the ContentId property.
+        /// </summary>
+        protected virtual void OnContentIdChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (LayoutElement != null)
+                LayoutElement.ContentId = (string)e.NewValue;
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        ReentrantFlag _isSelectedReentrantFlag = new ReentrantFlag();
+
+        /// <summary>
+        /// IsSelected Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IsSelectedProperty =
+            DependencyProperty.Register("IsSelected", typeof(bool), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((bool)false,
+                    new PropertyChangedCallback(OnIsSelectedChanged)));
+
+        /// <summary>
+        /// Gets or sets the IsSelected property.  This dependency property 
+        /// indicates if the item is selected inside its container.
+        /// </summary>
+        public bool IsSelected
+        {
+            get { return (bool)GetValue(IsSelectedProperty); }
+            set { SetValue(IsSelectedProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the IsSelected property.
+        /// </summary>
+        private static void OnIsSelectedChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnIsSelectedChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IsSelected property.
+        /// </summary>
+        protected virtual void OnIsSelectedChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (_isSelectedReentrantFlag.CanEnter)
+            {
+                using (_isSelectedReentrantFlag.Enter())
+                {
+                    if (LayoutElement != null)
+                        LayoutElement.IsSelected = (bool)e.NewValue;
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsActive
+
+        ReentrantFlag _isActiveReentrantFlag = new ReentrantFlag();
+
+        /// <summary>
+        /// IsActive Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IsActiveProperty =
+            DependencyProperty.Register("IsActive", typeof(bool), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((bool)false,
+                    new PropertyChangedCallback(OnIsActiveChanged)));
+
+        /// <summary>
+        /// Gets or sets the IsActive property.  This dependency property 
+        /// indicates if the item is active in the UI.
+        /// </summary>
+        public bool IsActive
+        {
+            get { return (bool)GetValue(IsActiveProperty); }
+            set { SetValue(IsActiveProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the IsActive property.
+        /// </summary>
+        private static void OnIsActiveChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnIsActiveChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IsActive property.
+        /// </summary>
+        protected virtual void OnIsActiveChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (_isActiveReentrantFlag.CanEnter)
+            {
+                using (_isActiveReentrantFlag.Enter())
+                {
+                    if (LayoutElement != null)
+                        LayoutElement.IsActive = (bool)e.NewValue;
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanClose
+
+        /// <summary>
+        /// CanClose Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CanCloseProperty =
+            DependencyProperty.Register("CanClose", typeof(bool), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((bool)true,
+                    new PropertyChangedCallback(OnCanCloseChanged)));
+
+        /// <summary>
+        /// Gets or sets the CanClose property.  This dependency property 
+        /// indicates if the item can be closed.
+        /// </summary>
+        public bool CanClose
+        {
+            get { return (bool)GetValue(CanCloseProperty); }
+            set { SetValue(CanCloseProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CanClose property.
+        /// </summary>
+        private static void OnCanCloseChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnCanCloseChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CanClose property.
+        /// </summary>
+        protected virtual void OnCanCloseChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (LayoutElement != null)
+                LayoutElement.CanClose = (bool)e.NewValue;
+        }
+
+        #endregion
+
+        #region CanFloat
+
+        /// <summary>
+        /// CanFloat Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CanFloatProperty =
+            DependencyProperty.Register("CanFloat", typeof(bool), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((bool)true,
+                    new PropertyChangedCallback(OnCanFloatChanged)));
+
+        /// <summary>
+        /// Gets or sets the CanFloat property.  This dependency property 
+        /// indicates if user can move the layout element dragging it to another position.
+        /// </summary>
+        public bool CanFloat
+        {
+            get { return (bool)GetValue(CanFloatProperty); }
+            set { SetValue(CanFloatProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CanFloat property.
+        /// </summary>
+        private static void OnCanFloatChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnCanFloatChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CanFloat property.
+        /// </summary>
+        protected virtual void OnCanFloatChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (LayoutElement != null)
+                LayoutElement.CanFloat = (bool)e.NewValue;
+        }
+
+        #endregion
+
+        #region CloseCommand
+
+        /// <summary>
+        /// CloseCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CloseCommandProperty =
+            DependencyProperty.Register("CloseCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnCloseCommandChanged),
+                    new CoerceValueCallback(CoerceCloseCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the CloseCommand property.  This dependency property 
+        /// indicates the command to execute when user click the document close button.
+        /// </summary>
+        public ICommand CloseCommand
+        {
+            get { return (ICommand)GetValue(CloseCommandProperty); }
+            set { SetValue(CloseCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CloseCommand property.
+        /// </summary>
+        private static void OnCloseCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnCloseCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CloseCommand property.
+        /// </summary>
+        protected virtual void OnCloseCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the CloseCommand value.
+        /// </summary>
+        private static object CoerceCloseCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteCloseCommand(object parameter)
+        {
+#if DEBUG
+          if( LayoutElement != null )
+            System.Diagnostics.Trace.WriteLine( string.Format( "CanExecuteCloseCommand({0}) = {1}", LayoutElement.Title, LayoutElement.CanClose ) );
+#endif
+            return LayoutElement != null && LayoutElement.CanClose;
+        }
+
+        private void ExecuteCloseCommand(object parameter)
+        {
+            Close();
+        }
+
+        protected abstract void Close();
+
+
+        #endregion
+
+        #region FloatCommand
+        /// <summary>
+        /// FloatCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty FloatCommandProperty =
+            DependencyProperty.Register("FloatCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnFloatCommandChanged),
+                    new CoerceValueCallback(CoerceFloatCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the FloatCommand property.  This dependency property 
+        /// indicates the command to execute when user click the float button.
+        /// </summary>
+        /// <remarks>By default this command move the anchorable inside new floating window.</remarks>
+        public ICommand FloatCommand
+        {
+            get { return (ICommand)GetValue(FloatCommandProperty); }
+            set { SetValue(FloatCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the FloatCommand property.
+        /// </summary>
+        private static void OnFloatCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnFloatCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the FloatCommand property.
+        /// </summary>
+        protected virtual void OnFloatCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the FloatCommand value.
+        /// </summary>
+        private static object CoerceFloatCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteFloatCommand(object anchorable)
+        {
+            return LayoutElement != null && LayoutElement.CanFloat && LayoutElement.FindParent<LayoutFloatingWindow>() == null;
+        }
+
+        private void ExecuteFloatCommand(object parameter)
+        {
+            LayoutElement.Root.Manager._ExecuteFloatCommand(LayoutElement);
+        }
+
+        protected virtual void Float()
+        { 
+
+        }
+
+        #endregion
+
+        #region DockAsDocumentCommand
+
+        /// <summary>
+        /// DockAsDocumentCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DockAsDocumentCommandProperty =
+            DependencyProperty.Register("DockAsDocumentCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnDockAsDocumentCommandChanged),
+                    new CoerceValueCallback(CoerceDockAsDocumentCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the DockAsDocumentCommand property.  This dependency property 
+        /// indicates the command to execute when user click the DockAsDocument button.
+        /// </summary>
+        /// <remarks>By default this command move the anchorable inside the last focused document pane.</remarks>
+        public ICommand DockAsDocumentCommand
+        {
+            get { return (ICommand)GetValue(DockAsDocumentCommandProperty); }
+            set { SetValue(DockAsDocumentCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DockAsDocumentCommand property.
+        /// </summary>
+        private static void OnDockAsDocumentCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnDockAsDocumentCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DockAsDocumentCommand property.
+        /// </summary>
+        protected virtual void OnDockAsDocumentCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the DockAsDocumentCommand value.
+        /// </summary>
+        private static object CoerceDockAsDocumentCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteDockAsDocumentCommand(object parameter)
+        {
+            return LayoutElement != null && LayoutElement.FindParent<LayoutDocumentPane>() == null;
+        }
+
+        private void ExecuteDockAsDocumentCommand(object parameter)
+        {
+            LayoutElement.Root.Manager._ExecuteDockAsDocumentCommand(LayoutElement);
+        }
+
+        #endregion
+
+        #region CloseAllButThisCommand
+
+        /// <summary>
+        /// CloseAllButThisCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty CloseAllButThisCommandProperty =
+            DependencyProperty.Register("CloseAllButThisCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnCloseAllButThisCommandChanged),
+                    new CoerceValueCallback(CoerceCloseAllButThisCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the CloseAllButThisCommand property.  This dependency property 
+        /// indicates the 'Close All But This' command.
+        /// </summary>
+        public ICommand CloseAllButThisCommand
+        {
+            get { return (ICommand)GetValue(CloseAllButThisCommandProperty); }
+            set { SetValue(CloseAllButThisCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the CloseAllButThisCommand property.
+        /// </summary>
+        private static void OnCloseAllButThisCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnCloseAllButThisCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the CloseAllButThisCommand property.
+        /// </summary>
+        protected virtual void OnCloseAllButThisCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the CloseAllButThisCommand value.
+        /// </summary>
+        private static object CoerceCloseAllButThisCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteCloseAllButThisCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            var root = LayoutElement.Root;
+            if (root == null)
+                return false;
+
+            return LayoutElement.Root.Manager.Layout.
+                Descendents().OfType<LayoutContent>().Where(d => d != LayoutElement && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).Any();
+        }
+
+        private void ExecuteCloseAllButThisCommand(object parameter)
+        {
+            LayoutElement.Root.Manager._ExecuteCloseAllButThisCommand(LayoutElement);
+        }
+
+        #endregion
+
+        #region ActivateCommand
+
+        /// <summary>
+        /// ActivateCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ActivateCommandProperty =
+            DependencyProperty.Register("ActivateCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnActivateCommandChanged),
+                    new CoerceValueCallback(CoerceActivateCommandValue)));
+
+        /// <summary>
+        /// Gets or sets the ActivateCommand property.  This dependency property 
+        /// indicates the command to execute when user wants to activate a content (either a Document or an Anchorable).
+        /// </summary>
+        public ICommand ActivateCommand
+        {
+            get { return (ICommand)GetValue(ActivateCommandProperty); }
+            set { SetValue(ActivateCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the ActivateCommand property.
+        /// </summary>
+        private static void OnActivateCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnActivateCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the ActivateCommand property.
+        /// </summary>
+        protected virtual void OnActivateCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the ActivateCommand value.
+        /// </summary>
+        private static object CoerceActivateCommandValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        private bool CanExecuteActivateCommand(object parameter)
+        {
+            return LayoutElement != null;
+        }
+
+        private void ExecuteActivateCommand(object parameter)
+        {
+            LayoutElement.Root.Manager._ExecuteContentActivateCommand(LayoutElement);
+        }
+
+        #endregion
+
+        #region NewVerticalTabGroupCommand
+
+        /// <summary>
+        /// NewVerticalTabGroupCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty NewVerticalTabGroupCommandProperty =
+            DependencyProperty.Register("NewVerticalTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((ICommand)null,
+                    new PropertyChangedCallback(OnNewVerticalTabGroupCommandChanged)));
+
+        /// <summary>
+        /// Gets or sets the NewVerticalTabGroupCommand property.  This dependency property 
+        /// indicates the new vertical tab group command.
+        /// </summary>
+        public ICommand NewVerticalTabGroupCommand
+        {
+            get { return (ICommand)GetValue(NewVerticalTabGroupCommandProperty); }
+            set { SetValue(NewVerticalTabGroupCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the NewVerticalTabGroupCommand property.
+        /// </summary>
+        private static void OnNewVerticalTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnNewVerticalTabGroupCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the NewVerticalTabGroupCommand property.
+        /// </summary>
+        protected virtual void OnNewVerticalTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        private bool CanExecuteNewVerticalTabGroupCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+            return ((parentDocumentGroup == null ||
+                parentDocumentGroup.ChildrenCount == 1 ||
+                parentDocumentGroup.Root.Manager.AllowMixedOrientation || 
+                parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Horizontal) &&
+                parentDocumentPane != null &&
+                parentDocumentPane.ChildrenCount > 1);
+        }
+
+        private void ExecuteNewVerticalTabGroupCommand(object parameter)
+        {
+            var layoutElement = LayoutElement;
+            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+
+            if (parentDocumentGroup == null)
+            {
+                var grandParent = parentDocumentPane.Parent as ILayoutContainer;
+                parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Horizontal };
+                grandParent.ReplaceChild(parentDocumentPane, parentDocumentGroup);
+                parentDocumentGroup.Children.Add(parentDocumentPane);
+            }
+            parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Horizontal; 
+            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
+            parentDocumentGroup.InsertChildAt(indexOfParentPane + 1, new LayoutDocumentPane(layoutElement));
+            layoutElement.IsActive = true;
+            layoutElement.Root.CollectGarbage();
+        }
+        #endregion
+
+        #region NewHorizontalTabGroupCommand
+
+        /// <summary>
+        /// NewHorizontalTabGroupCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty NewHorizontalTabGroupCommandProperty =
+            DependencyProperty.Register("NewHorizontalTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((ICommand)null,
+                    new PropertyChangedCallback(OnNewHorizontalTabGroupCommandChanged)));
+
+        /// <summary>
+        /// Gets or sets the NewHorizontalTabGroupCommand property.  This dependency property 
+        /// indicates the new horizontal tab group command.
+        /// </summary>
+        public ICommand NewHorizontalTabGroupCommand
+        {
+            get { return (ICommand)GetValue(NewHorizontalTabGroupCommandProperty); }
+            set { SetValue(NewHorizontalTabGroupCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the NewHorizontalTabGroupCommand property.
+        /// </summary>
+        private static void OnNewHorizontalTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnNewHorizontalTabGroupCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the NewHorizontalTabGroupCommand property.
+        /// </summary>
+        protected virtual void OnNewHorizontalTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+
+        private bool CanExecuteNewHorizontalTabGroupCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+            return ((parentDocumentGroup == null ||
+                parentDocumentGroup.ChildrenCount == 1 ||
+                parentDocumentGroup.Root.Manager.AllowMixedOrientation ||
+                parentDocumentGroup.Orientation == System.Windows.Controls.Orientation.Vertical) &&
+                parentDocumentPane != null &&
+                parentDocumentPane.ChildrenCount > 1);
+        }
+
+        private void ExecuteNewHorizontalTabGroupCommand(object parameter)
+        {
+            var layoutElement = LayoutElement;
+            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+
+            if (parentDocumentGroup == null)
+            {
+                var grandParent = parentDocumentPane.Parent as ILayoutContainer;
+                parentDocumentGroup = new LayoutDocumentPaneGroup() { Orientation = System.Windows.Controls.Orientation.Vertical };
+                grandParent.ReplaceChild(parentDocumentPane, parentDocumentGroup);
+                parentDocumentGroup.Children.Add(parentDocumentPane);
+            }
+            parentDocumentGroup.Orientation = System.Windows.Controls.Orientation.Vertical;
+            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
+            parentDocumentGroup.InsertChildAt(indexOfParentPane + 1, new LayoutDocumentPane(layoutElement));
+            layoutElement.IsActive = true;
+            layoutElement.Root.CollectGarbage();
+        }       
+        #endregion
+
+        #region MoveToNextTabGroupCommand
+
+        /// <summary>
+        /// MoveToNextTabGroupCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty MoveToNextTabGroupCommandProperty =
+            DependencyProperty.Register("MoveToNextTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((ICommand)null,
+                    new PropertyChangedCallback(OnMoveToNextTabGroupCommandChanged)));
+
+        /// <summary>
+        /// Gets or sets the MoveToNextTabGroupCommand property.  This dependency property 
+        /// indicates move to next tab group command.
+        /// </summary>
+        public ICommand MoveToNextTabGroupCommand
+        {
+            get { return (ICommand)GetValue(MoveToNextTabGroupCommandProperty); }
+            set { SetValue(MoveToNextTabGroupCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the MoveToNextTabGroupCommand property.
+        /// </summary>
+        private static void OnMoveToNextTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnMoveToNextTabGroupCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the MoveToNextTabGroupCommand property.
+        /// </summary>
+        protected virtual void OnMoveToNextTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        private bool CanExecuteMoveToNextTabGroupCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+
+            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+            return (parentDocumentGroup != null &&
+                parentDocumentPane != null &&
+                parentDocumentGroup.ChildrenCount > 1 &&
+                parentDocumentGroup.IndexOfChild(parentDocumentPane) < parentDocumentGroup.ChildrenCount - 1 &&
+                parentDocumentGroup.Children[parentDocumentGroup.IndexOfChild(parentDocumentPane) + 1] is LayoutDocumentPane);
+        }
+
+        private void ExecuteMoveToNextTabGroupCommand(object parameter)
+        {
+            var layoutElement = LayoutElement;
+            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
+            var nextDocumentPane = parentDocumentGroup.Children[indexOfParentPane + 1] as LayoutDocumentPane;
+            nextDocumentPane.InsertChildAt(0, layoutElement);
+            layoutElement.IsActive = true;
+            layoutElement.Root.CollectGarbage();
+        }
+
+        #endregion
+
+        #region MoveToPreviousTabGroupCommand
+
+        /// <summary>
+        /// MoveToPreviousTabGroupCommand Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty MoveToPreviousTabGroupCommandProperty =
+            DependencyProperty.Register("MoveToPreviousTabGroupCommand", typeof(ICommand), typeof(LayoutItem),
+                new FrameworkPropertyMetadata((ICommand)null,
+                    new PropertyChangedCallback(OnMoveToPreviousTabGroupCommandChanged)));
+
+        /// <summary>
+        /// Gets or sets the MoveToPreviousTabGroupCommand property.  This dependency property 
+        /// indicates move to rpevious tab group command.
+        /// </summary>
+        public ICommand MoveToPreviousTabGroupCommand
+        {
+            get { return (ICommand)GetValue(MoveToPreviousTabGroupCommandProperty); }
+            set { SetValue(MoveToPreviousTabGroupCommandProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the MoveToPreviousTabGroupCommand property.
+        /// </summary>
+        private static void OnMoveToPreviousTabGroupCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((LayoutItem)d).OnMoveToPreviousTabGroupCommandChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the MoveToPreviousTabGroupCommand property.
+        /// </summary>
+        protected virtual void OnMoveToPreviousTabGroupCommandChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        private bool CanExecuteMoveToPreviousTabGroupCommand(object parameter)
+        {
+            if (LayoutElement == null)
+                return false;
+            var parentDocumentGroup = LayoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = LayoutElement.Parent as LayoutDocumentPane;
+            return (parentDocumentGroup != null &&
+                parentDocumentPane != null &&
+                parentDocumentGroup.ChildrenCount > 1 &&
+                parentDocumentGroup.IndexOfChild(parentDocumentPane) > 0 &&
+                parentDocumentGroup.Children[parentDocumentGroup.IndexOfChild(parentDocumentPane) - 1] is LayoutDocumentPane);
+        }
+
+        private void ExecuteMoveToPreviousTabGroupCommand(object parameter)
+        {
+            var layoutElement = LayoutElement;
+            var parentDocumentGroup = layoutElement.FindParent<LayoutDocumentPaneGroup>();
+            var parentDocumentPane = layoutElement.Parent as LayoutDocumentPane;
+            int indexOfParentPane = parentDocumentGroup.IndexOfChild(parentDocumentPane);
+            var nextDocumentPane = parentDocumentGroup.Children[indexOfParentPane - 1] as LayoutDocumentPane;
+            nextDocumentPane.InsertChildAt(0, layoutElement);
+            layoutElement.IsActive = true;
+            layoutElement.Root.CollectGarbage();
+        }
+        #endregion
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
new file mode 100644
index 000000000..d71bc3ee1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
@@ -0,0 +1,131 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class LayoutPanelControl : LayoutGridControl<ILayoutPanelElement>, ILayoutControl
+    {
+        internal LayoutPanelControl(LayoutPanel model)
+            :base(model, model.Orientation)
+        {
+            _model = model;
+
+        }
+
+        LayoutPanel _model;
+
+        protected override void OnFixChildrenDockLengths()
+        {
+            if (ActualWidth == 0.0 ||
+                ActualHeight == 0.0)
+                return;
+
+            var modelAsPositionableElement = _model as ILayoutPositionableElementWithActualSize;
+            #region Setup DockWidth/Height for children
+            if (_model.Orientation == Orientation.Horizontal)
+            {
+                if (_model.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())
+                {
+                    for (int i = 0; i < _model.Children.Count; i++)
+                    {
+                        var childContainerModel = _model.Children[i] as ILayoutContainer;
+                        var childPositionableModel = _model.Children[i] as ILayoutPositionableElement;
+
+                        if (childContainerModel != null &&
+                            (childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() ||
+                             childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
+                        {
+                            childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
+                        }
+                        else if (childPositionableModel != null && childPositionableModel.DockWidth.IsStar)
+                        {
+                            var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize;
+
+                            var widthToSet = Math.Max(childPositionableModelWidthActualSize.ActualWidth, childPositionableModel.DockMinWidth);
+
+                            widthToSet = Math.Min(widthToSet, ActualWidth / 2.0);
+                            widthToSet = Math.Max(widthToSet, childPositionableModel.DockMinWidth);
+
+                            childPositionableModel.DockWidth = new GridLength(
+                                widthToSet,
+                                GridUnitType.Pixel);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < _model.Children.Count; i++)
+                    {
+                        var childPositionableModel = _model.Children[i] as ILayoutPositionableElement;
+                        if (!childPositionableModel.DockWidth.IsStar)
+                        {
+                            childPositionableModel.DockWidth = new GridLength(1.0, GridUnitType.Star);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                if (_model.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>())
+                {
+                    for (int i = 0; i < _model.Children.Count; i++)
+                    {
+                        var childContainerModel = _model.Children[i] as ILayoutContainer;
+                        var childPositionableModel = _model.Children[i] as ILayoutPositionableElement;
+
+                        if (childContainerModel != null &&
+                            (childContainerModel.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() ||
+                             childContainerModel.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
+                        {
+                            childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
+                        }
+                        else if (childPositionableModel != null && childPositionableModel.DockHeight.IsStar)
+                        {
+                            var childPositionableModelWidthActualSize = childPositionableModel as ILayoutPositionableElementWithActualSize;
+
+                            var heightToSet = Math.Max(childPositionableModelWidthActualSize.ActualHeight, childPositionableModel.DockMinHeight);
+                            heightToSet = Math.Min(heightToSet, ActualHeight / 2.0);
+                            heightToSet = Math.Max(heightToSet, childPositionableModel.DockMinHeight);
+
+                            childPositionableModel.DockHeight = new GridLength(heightToSet, GridUnitType.Pixel);
+                        }
+                    }
+                }
+                else
+                {
+                    for (int i = 0; i < _model.Children.Count; i++)
+                    {
+                        var childPositionableModel = _model.Children[i] as ILayoutPositionableElement;
+                        if (!childPositionableModel.DockHeight.IsStar)
+                        {
+                            childPositionableModel.DockHeight = new GridLength(1.0, GridUnitType.Star);
+                        }
+                    }
+                }
+            }
+            #endregion
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
new file mode 100644
index 000000000..811efb119
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
@@ -0,0 +1,139 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class MenuItemEx : MenuItem
+    {
+        static MenuItemEx()
+        {
+            IconProperty.OverrideMetadata(typeof(MenuItemEx), new FrameworkPropertyMetadata(new PropertyChangedCallback(OnIconPropertyChanged)));
+        }
+
+
+        public MenuItemEx()
+        {
+        }
+
+        #region IconTemplate
+
+        /// <summary>
+        /// IconTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IconTemplateProperty =
+            DependencyProperty.Register("IconTemplate", typeof(DataTemplate), typeof(MenuItemEx),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnIconTemplateChanged)));
+
+        /// <summary>
+        /// Gets or sets the IconTemplate property.  This dependency property 
+        /// indicates the data template for the icon.
+        /// </summary>
+        public DataTemplate IconTemplate
+        {
+            get { return (DataTemplate)GetValue(IconTemplateProperty); }
+            set { SetValue(IconTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the IconTemplate property.
+        /// </summary>
+        private static void OnIconTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((MenuItemEx)d).OnIconTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IconTemplate property.
+        /// </summary>
+        protected virtual void OnIconTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+            UpdateIcon();
+        }
+
+        #endregion
+
+        #region IconTemplateSelector
+
+        /// <summary>
+        /// IconTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IconTemplateSelectorProperty =
+            DependencyProperty.Register("IconTemplateSelector", typeof(DataTemplateSelector), typeof(MenuItemEx),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnIconTemplateSelectorChanged)));
+
+        /// <summary>
+        /// Gets or sets the IconTemplateSelector property.  This dependency property 
+        /// indicates the DataTemplateSelector for the Icon.
+        /// </summary>
+        public DataTemplateSelector IconTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(IconTemplateSelectorProperty); }
+            set { SetValue(IconTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the IconTemplateSelector property.
+        /// </summary>
+        private static void OnIconTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((MenuItemEx)d).OnIconTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IconTemplateSelector property.
+        /// </summary>
+        protected virtual void OnIconTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            UpdateIcon();
+        }
+
+        #endregion
+
+        static void OnIconPropertyChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null)
+            {
+                ((MenuItemEx)sender).UpdateIcon();
+            }
+        }
+
+        bool _reentrantFlag = false;
+        void UpdateIcon()
+        {
+            if (_reentrantFlag)
+                return;
+            _reentrantFlag = true;
+            if (IconTemplateSelector != null)
+            {
+                var dataTemplateToUse = IconTemplateSelector.SelectTemplate(Icon, this);
+                if (dataTemplateToUse != null)
+                    Icon = dataTemplateToUse.LoadContent();
+            }
+            else if (IconTemplate != null)
+                Icon = IconTemplate.LoadContent();
+            _reentrantFlag = false;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
new file mode 100644
index 000000000..5ec38eb11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
@@ -0,0 +1,344 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Interop;
+using System.Windows.Threading;
+using Xceed.Wpf.AvalonDock.Themes;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class NavigatorWindow : Window
+    {
+        static NavigatorWindow()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(typeof(NavigatorWindow)));
+            ShowActivatedProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(false));
+            ShowInTaskbarProperty.OverrideMetadata(typeof(NavigatorWindow), new FrameworkPropertyMetadata(false));
+        }
+
+        DockingManager _manager;
+        internal NavigatorWindow(DockingManager manager)
+        {
+            _manager = manager;
+
+            _internalSetSelectedDocument = true;
+            SetAnchorables(_manager.Layout.Descendents().OfType<LayoutAnchorable>().Where(a => a.IsVisible).Select(d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel(d)).ToArray());
+            SetDocuments(_manager.Layout.Descendents().OfType<LayoutDocument>().OrderByDescending(d => d.LastActivationTimeStamp.GetValueOrDefault()).Select(d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel(d)).ToArray());
+            _internalSetSelectedDocument = false;
+
+            if (Documents.Length > 1)
+                InternalSetSelectedDocument(Documents[1]);
+
+            this.DataContext = this;
+
+            this.Loaded += new RoutedEventHandler(OnLoaded);
+            this.Unloaded += new RoutedEventHandler(OnUnloaded);
+
+            UpdateThemeResources();
+        }
+
+
+        internal void UpdateThemeResources(Theme oldTheme = null)
+        {
+            if (oldTheme != null)
+            {
+                var resourceDictionaryToRemove =
+                    Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+                if (resourceDictionaryToRemove != null)
+                    Resources.MergedDictionaries.Remove(
+                        resourceDictionaryToRemove);
+            }
+
+            if (_manager.Theme != null)
+            {
+                Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _manager.Theme.GetResourceUri() });
+            }
+        }
+
+
+        void OnLoaded(object sender, RoutedEventArgs e)
+        {
+            this.Loaded -= new RoutedEventHandler(OnLoaded);
+
+            this.Focus();
+
+            //this.SetParentToMainWindowOf(_manager);
+            WindowStartupLocation = WindowStartupLocation.CenterOwner;
+        }
+
+        void OnUnloaded(object sender, RoutedEventArgs e)
+        {
+            this.Unloaded -= new RoutedEventHandler(OnUnloaded);
+
+            //_hwndSrc.RemoveHook(_hwndSrcHook);
+            //_hwndSrc.Dispose();
+            //_hwndSrc = null;
+        }
+
+        //protected virtual IntPtr FilterMessage(
+        //    IntPtr hwnd,
+        //    int msg,
+        //    IntPtr wParam,
+        //    IntPtr lParam,
+        //    ref bool handled
+        //    )
+        //{
+        //    handled = false;
+
+        //    switch (msg)
+        //    {
+        //        case Win32Helper.WM_ACTIVATE:
+        //            if (((int)wParam & 0xFFFF) == Win32Helper.WA_INACTIVE)
+        //            {
+        //                if (lParam == new WindowInteropHelper(this.Owner).Handle)
+        //                {
+        //                    Win32Helper.SetActiveWindow(_hwndSrc.Handle);
+        //                    handled = true;
+        //                }
+
+        //            }
+        //            break;
+        //    }
+
+        //    return IntPtr.Zero;
+        //}
+
+
+        #region Documents
+
+        /// <summary>
+        /// Documents Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey DocumentsPropertyKey
+            = DependencyProperty.RegisterReadOnly("Documents", typeof(IEnumerable<LayoutDocumentItem>), typeof(NavigatorWindow),
+                new FrameworkPropertyMetadata(null));
+
+        public static readonly DependencyProperty DocumentsProperty
+            = DocumentsPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the Documents property.  This dependency property 
+        /// indicates the list of documents.
+        /// </summary>
+        public LayoutDocumentItem[] Documents
+        {
+            get { return (LayoutDocumentItem[])GetValue(DocumentsProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the Documents property.  
+        /// This dependency property indicates the list of documents.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetDocuments(LayoutDocumentItem[] value)
+        {
+            SetValue(DocumentsPropertyKey, value);
+        }
+
+        #endregion
+
+        #region Anchorables
+
+        /// <summary>
+        /// Anchorables Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey AnchorablesPropertyKey
+            = DependencyProperty.RegisterReadOnly("Anchorables", typeof(IEnumerable<LayoutAnchorableItem>), typeof(NavigatorWindow),
+                new FrameworkPropertyMetadata((IEnumerable<LayoutAnchorableItem>)null));
+
+        public static readonly DependencyProperty AnchorablesProperty
+            = AnchorablesPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the Anchorables property.  This dependency property 
+        /// indicates the list of anchorables.
+        /// </summary>
+        public IEnumerable<LayoutAnchorableItem> Anchorables
+        {
+            get { return (IEnumerable<LayoutAnchorableItem>)GetValue(AnchorablesProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the Anchorables property.  
+        /// This dependency property indicates the list of anchorables.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetAnchorables(IEnumerable<LayoutAnchorableItem> value)
+        {
+            SetValue(AnchorablesPropertyKey, value);
+        }
+
+        #endregion
+
+        #region SelectedDocument
+
+        /// <summary>
+        /// SelectedDocument Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty SelectedDocumentProperty =
+            DependencyProperty.Register("SelectedDocument", typeof(LayoutDocumentItem), typeof(NavigatorWindow),
+                new FrameworkPropertyMetadata((LayoutDocumentItem)null,
+                    new PropertyChangedCallback(OnSelectedDocumentChanged)));
+
+        /// <summary>
+        /// Gets or sets the SelectedDocument property.  This dependency property 
+        /// indicates the selected document.
+        /// </summary>
+        public LayoutDocumentItem SelectedDocument
+        {
+            get { return (LayoutDocumentItem)GetValue(SelectedDocumentProperty); }
+            set { SetValue(SelectedDocumentProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the SelectedDocument property.
+        /// </summary>
+        private static void OnSelectedDocumentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((NavigatorWindow)d).OnSelectedDocumentChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the SelectedDocument property.
+        /// </summary>
+        protected virtual void OnSelectedDocumentChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (_internalSetSelectedDocument)
+                return;
+
+            if (SelectedDocument != null &&
+                SelectedDocument.ActivateCommand.CanExecute(null))
+            {
+              System.Diagnostics.Trace.WriteLine( "OnSelectedDocumentChanged()" );
+                SelectedDocument.ActivateCommand.Execute(null);
+                Hide();
+            }
+
+        }
+
+        bool _internalSetSelectedDocument = false;
+        void InternalSetSelectedDocument(LayoutDocumentItem documentToSelect)
+        {
+            _internalSetSelectedDocument = true;
+            SelectedDocument = documentToSelect;
+            _internalSetSelectedDocument = false;
+        }
+
+        #endregion
+
+        #region SelectedAnchorable
+
+        /// <summary>
+        /// SelectedAnchorable Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty SelectedAnchorableProperty =
+            DependencyProperty.Register("SelectedAnchorable", typeof(LayoutAnchorableItem), typeof(NavigatorWindow),
+                new FrameworkPropertyMetadata((LayoutAnchorableItem)null,
+                    new PropertyChangedCallback(OnSelectedAnchorableChanged)));
+
+        /// <summary>
+        /// Gets or sets the SelectedAnchorable property.  This dependency property 
+        /// indicates the selected anchorable.
+        /// </summary>
+        public LayoutAnchorableItem SelectedAnchorable
+        {
+            get { return (LayoutAnchorableItem)GetValue(SelectedAnchorableProperty); }
+            set { SetValue(SelectedAnchorableProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the SelectedAnchorable property.
+        /// </summary>
+        private static void OnSelectedAnchorableChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((NavigatorWindow)d).OnSelectedAnchorableChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the SelectedAnchorable property.
+        /// </summary>
+        protected virtual void OnSelectedAnchorableChanged(DependencyPropertyChangedEventArgs e)
+        {
+            var selectedAnchorable = e.NewValue as LayoutAnchorableItem;
+            if (SelectedAnchorable != null &&
+                SelectedAnchorable.ActivateCommand.CanExecute(null))
+            {
+                SelectedAnchorable.ActivateCommand.Execute(null);
+                Close();
+            }
+        }
+
+        #endregion
+
+
+        internal void SelectNextDocument()
+        {
+            if (SelectedDocument != null)
+            {
+                int docIndex = Documents.IndexOf<LayoutDocumentItem>(SelectedDocument);
+                docIndex++;
+                if (docIndex == Documents.Length)
+                    docIndex = 0;
+                InternalSetSelectedDocument(Documents[docIndex]);
+            }
+
+        }
+
+        protected override void OnKeyDown(System.Windows.Input.KeyEventArgs e)
+        {
+            base.OnKeyDown(e);
+        }
+
+        protected override void OnPreviewKeyDown(System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.Tab)
+            {
+                SelectNextDocument();
+                e.Handled = true;
+            }
+
+
+            base.OnPreviewKeyDown(e);
+        }
+
+        protected override void OnPreviewKeyUp(System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key != System.Windows.Input.Key.Tab)
+            {
+                if (SelectedAnchorable != null &&
+                    SelectedAnchorable.ActivateCommand.CanExecute(null))
+                    SelectedAnchorable.ActivateCommand.Execute(null);
+
+                if (SelectedAnchorable == null &&
+                    SelectedDocument != null &&
+                    SelectedDocument.ActivateCommand.CanExecute(null))
+                    SelectedDocument.ActivateCommand.Execute(null);
+                Close();
+                e.Handled = true;
+            }       
+
+
+            base.OnPreviewKeyUp(e);
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
new file mode 100644
index 000000000..c402c97fc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
@@ -0,0 +1,54 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public abstract class OverlayArea : IOverlayWindowArea
+    {
+        internal OverlayArea(IOverlayWindow overlayWindow)
+        {
+            _overlayWindow = overlayWindow;
+        }
+
+        IOverlayWindow _overlayWindow;
+
+        Rect? _screenDetectionArea;
+        Rect IOverlayWindowArea.ScreenDetectionArea
+        {
+            get
+            {
+                return _screenDetectionArea.Value;
+            }
+        }
+
+        protected void SetScreenDetectionArea(Rect rect)
+        {
+            _screenDetectionArea = rect;
+        }
+
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
new file mode 100644
index 000000000..6010ac426
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
@@ -0,0 +1,560 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Shapes;
+using Xceed.Wpf.AvalonDock.Layout;
+using System.Diagnostics;
+using Xceed.Wpf.AvalonDock.Themes;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class OverlayWindow : Window, IOverlayWindow
+    {
+        static OverlayWindow()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(typeof(OverlayWindow)));
+
+            OverlayWindow.AllowsTransparencyProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(true));
+            OverlayWindow.WindowStyleProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(WindowStyle.None));
+            OverlayWindow.ShowInTaskbarProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(false));
+            OverlayWindow.ShowActivatedProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(false));
+            OverlayWindow.VisibilityProperty.OverrideMetadata(typeof(OverlayWindow), new FrameworkPropertyMetadata(Visibility.Hidden));
+        }
+
+
+        internal OverlayWindow(IOverlayWindowHost host)
+        {
+            _host = host;
+            UpdateThemeResources();
+        }
+
+
+        internal void UpdateThemeResources(Theme oldTheme = null)
+        {
+            if (oldTheme != null)
+            {
+                var resourceDictionaryToRemove =
+                    Resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+                if (resourceDictionaryToRemove != null)
+                    Resources.MergedDictionaries.Remove(
+                        resourceDictionaryToRemove);
+            }
+
+            if (_host.Manager.Theme != null)
+            {
+                Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = _host.Manager.Theme.GetResourceUri() });
+            }
+        }
+
+
+        Canvas _mainCanvasPanel;
+        Grid _gridDockingManagerDropTargets;
+        Grid _gridAnchorablePaneDropTargets;
+        Grid _gridDocumentPaneDropTargets;
+        Grid _gridDocumentPaneFullDropTargets;
+
+        FrameworkElement _dockingManagerDropTargetBottom;
+        FrameworkElement _dockingManagerDropTargetTop;
+        FrameworkElement _dockingManagerDropTargetLeft;
+        FrameworkElement _dockingManagerDropTargetRight;
+
+        FrameworkElement _anchorablePaneDropTargetBottom;
+        FrameworkElement _anchorablePaneDropTargetTop;
+        FrameworkElement _anchorablePaneDropTargetLeft;
+        FrameworkElement _anchorablePaneDropTargetRight;
+        FrameworkElement _anchorablePaneDropTargetInto;
+
+        FrameworkElement _documentPaneDropTargetBottom;
+        FrameworkElement _documentPaneDropTargetTop;
+        FrameworkElement _documentPaneDropTargetLeft;
+        FrameworkElement _documentPaneDropTargetRight;
+        FrameworkElement _documentPaneDropTargetInto;
+
+        FrameworkElement _documentPaneDropTargetBottomAsAnchorablePane;
+        FrameworkElement _documentPaneDropTargetTopAsAnchorablePane;
+        FrameworkElement _documentPaneDropTargetLeftAsAnchorablePane;
+        FrameworkElement _documentPaneDropTargetRightAsAnchorablePane;
+
+        FrameworkElement _documentPaneFullDropTargetBottom;
+        FrameworkElement _documentPaneFullDropTargetTop;
+        FrameworkElement _documentPaneFullDropTargetLeft;
+        FrameworkElement _documentPaneFullDropTargetRight;
+        FrameworkElement _documentPaneFullDropTargetInto;
+
+        Path _previewBox;
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            _mainCanvasPanel = GetTemplateChild("PART_DropTargetsContainer") as Canvas;
+            _gridDockingManagerDropTargets = GetTemplateChild("PART_DockingManagerDropTargets") as Grid;
+            _gridAnchorablePaneDropTargets = GetTemplateChild("PART_AnchorablePaneDropTargets") as Grid;
+            _gridDocumentPaneDropTargets = GetTemplateChild("PART_DocumentPaneDropTargets") as Grid;
+            _gridDocumentPaneFullDropTargets = GetTemplateChild("PART_DocumentPaneFullDropTargets") as Grid;
+
+            _gridDockingManagerDropTargets.Visibility = System.Windows.Visibility.Hidden;
+            _gridAnchorablePaneDropTargets.Visibility = System.Windows.Visibility.Hidden;
+            _gridDocumentPaneDropTargets.Visibility = System.Windows.Visibility.Hidden;
+            if (_gridDocumentPaneFullDropTargets != null)
+                _gridDocumentPaneFullDropTargets.Visibility = System.Windows.Visibility.Hidden;
+
+            _dockingManagerDropTargetBottom = GetTemplateChild("PART_DockingManagerDropTargetBottom") as FrameworkElement;
+            _dockingManagerDropTargetTop = GetTemplateChild("PART_DockingManagerDropTargetTop") as FrameworkElement;
+            _dockingManagerDropTargetLeft = GetTemplateChild("PART_DockingManagerDropTargetLeft") as FrameworkElement;
+            _dockingManagerDropTargetRight = GetTemplateChild("PART_DockingManagerDropTargetRight") as FrameworkElement;
+
+            _anchorablePaneDropTargetBottom = GetTemplateChild("PART_AnchorablePaneDropTargetBottom") as FrameworkElement;
+            _anchorablePaneDropTargetTop = GetTemplateChild("PART_AnchorablePaneDropTargetTop") as FrameworkElement;
+            _anchorablePaneDropTargetLeft = GetTemplateChild("PART_AnchorablePaneDropTargetLeft") as FrameworkElement;
+            _anchorablePaneDropTargetRight = GetTemplateChild("PART_AnchorablePaneDropTargetRight") as FrameworkElement;
+            _anchorablePaneDropTargetInto = GetTemplateChild("PART_AnchorablePaneDropTargetInto") as FrameworkElement;
+
+            _documentPaneDropTargetBottom = GetTemplateChild("PART_DocumentPaneDropTargetBottom") as FrameworkElement;
+            _documentPaneDropTargetTop = GetTemplateChild("PART_DocumentPaneDropTargetTop") as FrameworkElement;
+            _documentPaneDropTargetLeft = GetTemplateChild("PART_DocumentPaneDropTargetLeft") as FrameworkElement;
+            _documentPaneDropTargetRight = GetTemplateChild("PART_DocumentPaneDropTargetRight") as FrameworkElement;
+            _documentPaneDropTargetInto = GetTemplateChild("PART_DocumentPaneDropTargetInto") as FrameworkElement;
+
+            _documentPaneDropTargetBottomAsAnchorablePane = GetTemplateChild("PART_DocumentPaneDropTargetBottomAsAnchorablePane") as FrameworkElement;
+            _documentPaneDropTargetTopAsAnchorablePane = GetTemplateChild("PART_DocumentPaneDropTargetTopAsAnchorablePane") as FrameworkElement;
+            _documentPaneDropTargetLeftAsAnchorablePane = GetTemplateChild("PART_DocumentPaneDropTargetLeftAsAnchorablePane") as FrameworkElement;
+            _documentPaneDropTargetRightAsAnchorablePane = GetTemplateChild("PART_DocumentPaneDropTargetRightAsAnchorablePane") as FrameworkElement;
+
+            _documentPaneFullDropTargetBottom = GetTemplateChild("PART_DocumentPaneFullDropTargetBottom") as FrameworkElement;
+            _documentPaneFullDropTargetTop = GetTemplateChild("PART_DocumentPaneFullDropTargetTop") as FrameworkElement;
+            _documentPaneFullDropTargetLeft = GetTemplateChild("PART_DocumentPaneFullDropTargetLeft") as FrameworkElement;
+            _documentPaneFullDropTargetRight = GetTemplateChild("PART_DocumentPaneFullDropTargetRight") as FrameworkElement;
+            _documentPaneFullDropTargetInto = GetTemplateChild("PART_DocumentPaneFullDropTargetInto") as FrameworkElement;
+
+            _previewBox = GetTemplateChild("PART_PreviewBox") as Path;
+        }
+
+
+        internal void EnableDropTargets()
+        {
+          //Trace.WriteLine("EnableDropTargets()");
+            if (_mainCanvasPanel != null)
+                _mainCanvasPanel.Visibility = System.Windows.Visibility.Visible;
+        }
+
+        internal void HideDropTargets()
+        {
+          //Trace.WriteLine("HideDropTargets()");
+            if (_mainCanvasPanel != null)
+                _mainCanvasPanel.Visibility = System.Windows.Visibility.Hidden;
+
+        }
+
+        IOverlayWindowHost _host;
+
+        IEnumerable<IDropTarget> IOverlayWindow.GetTargets()
+        {
+            foreach (var visibleArea in _visibleAreas)
+            {
+                switch (visibleArea.Type)
+                {
+                    case DropAreaType.DockingManager:
+                        {
+                            var dropAreaDockingManager = visibleArea as DropArea<DockingManager>;
+                            yield return new DockingManagerDropTarget(dropAreaDockingManager.AreaElement, _dockingManagerDropTargetLeft.GetScreenArea(), DropTargetType.DockingManagerDockLeft);
+                            yield return new DockingManagerDropTarget(dropAreaDockingManager.AreaElement, _dockingManagerDropTargetTop.GetScreenArea(), DropTargetType.DockingManagerDockTop);
+                            yield return new DockingManagerDropTarget(dropAreaDockingManager.AreaElement, _dockingManagerDropTargetBottom.GetScreenArea(), DropTargetType.DockingManagerDockBottom);
+                            yield return new DockingManagerDropTarget(dropAreaDockingManager.AreaElement, _dockingManagerDropTargetRight.GetScreenArea(), DropTargetType.DockingManagerDockRight);
+                        }
+                        break;
+                    case DropAreaType.AnchorablePane:
+                        {
+                            var dropAreaAnchorablePane = visibleArea as DropArea<LayoutAnchorablePaneControl>;
+                            yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetLeft.GetScreenArea(), DropTargetType.AnchorablePaneDockLeft);
+                            yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetTop.GetScreenArea(), DropTargetType.AnchorablePaneDockTop);
+                            yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetRight.GetScreenArea(), DropTargetType.AnchorablePaneDockRight);
+                            yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetBottom.GetScreenArea(), DropTargetType.AnchorablePaneDockBottom);
+                            yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, _anchorablePaneDropTargetInto.GetScreenArea(), DropTargetType.AnchorablePaneDockInside);
+
+                            var parentPaneModel = dropAreaAnchorablePane.AreaElement.Model as LayoutAnchorablePane;
+                            LayoutAnchorableTabItem lastAreaTabItem = null;
+                            foreach (var dropAreaTabItem in dropAreaAnchorablePane.AreaElement.FindVisualChildren<LayoutAnchorableTabItem>())
+                            {
+                                var tabItemModel = dropAreaTabItem.Model as LayoutAnchorable;
+                                lastAreaTabItem = lastAreaTabItem == null || lastAreaTabItem.GetScreenArea().Right < dropAreaTabItem.GetScreenArea().Right ?
+                                    dropAreaTabItem : lastAreaTabItem;
+                                int tabIndex = parentPaneModel.Children.IndexOf(tabItemModel);
+                                yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, dropAreaTabItem.GetScreenArea(), DropTargetType.AnchorablePaneDockInside, tabIndex);
+                            }
+
+                            if (lastAreaTabItem != null)
+                            {
+                                var lastAreaTabItemScreenArea = lastAreaTabItem.GetScreenArea();
+                                var newAreaTabItemScreenArea = new Rect(lastAreaTabItemScreenArea.TopRight, new Point(lastAreaTabItemScreenArea.Right + lastAreaTabItemScreenArea.Width, lastAreaTabItemScreenArea.Bottom));
+                                if (newAreaTabItemScreenArea.Right < dropAreaAnchorablePane.AreaElement.GetScreenArea().Right)
+                                    yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, newAreaTabItemScreenArea, DropTargetType.AnchorablePaneDockInside, parentPaneModel.Children.Count);
+                            }
+
+                            var dropAreaTitle = dropAreaAnchorablePane.AreaElement.FindVisualChildren<AnchorablePaneTitle>().FirstOrDefault();
+                            if (dropAreaTitle != null)
+                                yield return new AnchorablePaneDropTarget(dropAreaAnchorablePane.AreaElement, dropAreaTitle.GetScreenArea(), DropTargetType.AnchorablePaneDockInside);
+                        }
+                        break;
+                    case DropAreaType.DocumentPane:
+                        {
+                            bool isDraggingAnchorables = _floatingWindow.Model is LayoutAnchorableFloatingWindow;
+                            if (isDraggingAnchorables && _gridDocumentPaneFullDropTargets != null)
+                            {
+                                var dropAreaDocumentPane = visibleArea as DropArea<LayoutDocumentPaneControl>;
+                                if (_documentPaneFullDropTargetLeft.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneFullDropTargetLeft.GetScreenArea(), DropTargetType.DocumentPaneDockLeft);
+                                if (_documentPaneFullDropTargetTop.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneFullDropTargetTop.GetScreenArea(), DropTargetType.DocumentPaneDockTop);
+                                if (_documentPaneFullDropTargetRight.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneFullDropTargetRight.GetScreenArea(), DropTargetType.DocumentPaneDockRight);
+                                if (_documentPaneFullDropTargetBottom.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneFullDropTargetBottom.GetScreenArea(), DropTargetType.DocumentPaneDockBottom);
+                                if (_documentPaneFullDropTargetInto.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneFullDropTargetInto.GetScreenArea(), DropTargetType.DocumentPaneDockInside);
+
+                                var parentPaneModel = dropAreaDocumentPane.AreaElement.Model as LayoutDocumentPane;
+                                LayoutDocumentTabItem lastAreaTabItem = null;
+                                foreach (var dropAreaTabItem in dropAreaDocumentPane.AreaElement.FindVisualChildren<LayoutDocumentTabItem>())
+                                {
+                                    var tabItemModel = dropAreaTabItem.Model;
+                                    lastAreaTabItem = lastAreaTabItem == null || lastAreaTabItem.GetScreenArea().Right < dropAreaTabItem.GetScreenArea().Right ?
+                                        dropAreaTabItem : lastAreaTabItem;
+                                    int tabIndex = parentPaneModel.Children.IndexOf(tabItemModel);
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, dropAreaTabItem.GetScreenArea(), DropTargetType.DocumentPaneDockInside, tabIndex);
+                                }
+
+                                if (lastAreaTabItem != null)
+                                {
+                                    var lastAreaTabItemScreenArea = lastAreaTabItem.GetScreenArea();
+                                    var newAreaTabItemScreenArea = new Rect(lastAreaTabItemScreenArea.TopRight, new Point(lastAreaTabItemScreenArea.Right + lastAreaTabItemScreenArea.Width, lastAreaTabItemScreenArea.Bottom));
+                                    if (newAreaTabItemScreenArea.Right < dropAreaDocumentPane.AreaElement.GetScreenArea().Right)
+                                        yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, newAreaTabItemScreenArea, DropTargetType.DocumentPaneDockInside, parentPaneModel.Children.Count);
+                                }
+
+                                if (_documentPaneDropTargetLeftAsAnchorablePane.IsVisible)
+                                    yield return new DocumentPaneDropAsAnchorableTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetLeftAsAnchorablePane.GetScreenArea(), DropTargetType.DocumentPaneDockAsAnchorableLeft);
+                                if (_documentPaneDropTargetTopAsAnchorablePane.IsVisible)
+                                    yield return new DocumentPaneDropAsAnchorableTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetTopAsAnchorablePane.GetScreenArea(), DropTargetType.DocumentPaneDockAsAnchorableTop);
+                                if (_documentPaneDropTargetRightAsAnchorablePane.IsVisible)
+                                    yield return new DocumentPaneDropAsAnchorableTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetRightAsAnchorablePane.GetScreenArea(), DropTargetType.DocumentPaneDockAsAnchorableRight);
+                                if (_documentPaneDropTargetBottomAsAnchorablePane.IsVisible)
+                                    yield return new DocumentPaneDropAsAnchorableTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetBottomAsAnchorablePane.GetScreenArea(), DropTargetType.DocumentPaneDockAsAnchorableBottom);
+                            }
+                            else
+                            {
+
+                                var dropAreaDocumentPane = visibleArea as DropArea<LayoutDocumentPaneControl>;
+                                if (_documentPaneDropTargetLeft.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetLeft.GetScreenArea(), DropTargetType.DocumentPaneDockLeft);
+                                if (_documentPaneDropTargetTop.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetTop.GetScreenArea(), DropTargetType.DocumentPaneDockTop);
+                                if (_documentPaneDropTargetRight.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetRight.GetScreenArea(), DropTargetType.DocumentPaneDockRight);
+                                if (_documentPaneDropTargetBottom.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetBottom.GetScreenArea(), DropTargetType.DocumentPaneDockBottom);
+                                if (_documentPaneDropTargetInto.IsVisible)
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetInto.GetScreenArea(), DropTargetType.DocumentPaneDockInside);
+
+                                var parentPaneModel = dropAreaDocumentPane.AreaElement.Model as LayoutDocumentPane;
+                                LayoutDocumentTabItem lastAreaTabItem = null;
+                                foreach (var dropAreaTabItem in dropAreaDocumentPane.AreaElement.FindVisualChildren<LayoutDocumentTabItem>())
+                                {
+                                    var tabItemModel = dropAreaTabItem.Model;
+                                    lastAreaTabItem = lastAreaTabItem == null || lastAreaTabItem.GetScreenArea().Right < dropAreaTabItem.GetScreenArea().Right ?
+                                        dropAreaTabItem : lastAreaTabItem;
+                                    int tabIndex = parentPaneModel.Children.IndexOf(tabItemModel);
+                                    yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, dropAreaTabItem.GetScreenArea(), DropTargetType.DocumentPaneDockInside, tabIndex);
+                                }
+
+                                if (lastAreaTabItem != null)
+                                {
+                                    var lastAreaTabItemScreenArea = lastAreaTabItem.GetScreenArea();
+                                    var newAreaTabItemScreenArea = new Rect(lastAreaTabItemScreenArea.TopRight, new Point(lastAreaTabItemScreenArea.Right + lastAreaTabItemScreenArea.Width, lastAreaTabItemScreenArea.Bottom));
+                                    if (newAreaTabItemScreenArea.Right < dropAreaDocumentPane.AreaElement.GetScreenArea().Right)
+                                        yield return new DocumentPaneDropTarget(dropAreaDocumentPane.AreaElement, newAreaTabItemScreenArea, DropTargetType.DocumentPaneDockInside, parentPaneModel.Children.Count);
+                                }
+                            }
+                        }
+                        break;
+                    case DropAreaType.DocumentPaneGroup:
+                        {
+                            var dropAreaDocumentPane = visibleArea as DropArea<LayoutDocumentPaneGroupControl>;
+                            if (_documentPaneDropTargetInto.IsVisible)
+                                yield return new DocumentPaneGroupDropTarget(dropAreaDocumentPane.AreaElement, _documentPaneDropTargetInto.GetScreenArea(), DropTargetType.DocumentPaneGroupDockInside);
+                        }
+                        break;
+                }
+
+            }
+            yield break;
+        }
+
+        LayoutFloatingWindowControl _floatingWindow = null;
+        void IOverlayWindow.DragEnter(LayoutFloatingWindowControl floatingWindow)
+        {
+            _floatingWindow = floatingWindow;
+            EnableDropTargets();
+        }
+
+        void IOverlayWindow.DragLeave(LayoutFloatingWindowControl floatingWindow)
+        {
+            Visibility = System.Windows.Visibility.Hidden;
+            _floatingWindow = null;
+        }
+
+        protected override void OnClosing(System.ComponentModel.CancelEventArgs e)
+        {
+            base.OnClosing(e);
+        }
+
+
+        List<IDropArea> _visibleAreas = new List<IDropArea>();
+        void IOverlayWindow.DragEnter(IDropArea area)
+        {
+            _visibleAreas.Add(area);
+
+            FrameworkElement areaElement;
+            switch (area.Type)
+            {
+                case DropAreaType.DockingManager:
+                    areaElement = _gridDockingManagerDropTargets;
+                    break;
+                case DropAreaType.AnchorablePane:
+                    areaElement = _gridAnchorablePaneDropTargets;
+                    break;
+                case DropAreaType.DocumentPaneGroup:
+                    {
+                        areaElement = _gridDocumentPaneDropTargets;
+                        var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneGroupControl>;
+                        var layoutDocumentPane = (dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPaneGroup).Children.First() as LayoutDocumentPane;
+                        var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
+
+                        _documentPaneDropTargetLeft.Visibility = Visibility.Hidden;
+                        _documentPaneDropTargetRight.Visibility = Visibility.Hidden;
+                        _documentPaneDropTargetTop.Visibility = Visibility.Hidden;
+                        _documentPaneDropTargetBottom.Visibility = Visibility.Hidden;
+                    }
+                    break;
+                case DropAreaType.DocumentPane:
+                default:
+                    {
+                        bool isDraggingAnchorables = _floatingWindow.Model is LayoutAnchorableFloatingWindow;
+                        if (isDraggingAnchorables && _gridDocumentPaneFullDropTargets != null)
+                        {
+                            areaElement = _gridDocumentPaneFullDropTargets;
+                            var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneControl>;
+                            var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane;
+                            var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
+
+                            if (parentDocumentPaneGroup != null &&
+                                parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1)
+                            {
+                                var manager = parentDocumentPaneGroup.Root.Manager;
+                                if (!manager.AllowMixedOrientation)
+                                {
+                                    _documentPaneFullDropTargetLeft.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Horizontal ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneFullDropTargetRight.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Horizontal ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneFullDropTargetTop.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Vertical ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneFullDropTargetBottom.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Vertical ? Visibility.Visible : Visibility.Hidden;
+                                }
+                                else
+                                {
+                                    _documentPaneFullDropTargetLeft.Visibility = Visibility.Visible;
+                                    _documentPaneFullDropTargetRight.Visibility = Visibility.Visible;
+                                    _documentPaneFullDropTargetTop.Visibility = Visibility.Visible;
+                                    _documentPaneFullDropTargetBottom.Visibility = Visibility.Visible;
+                                }
+                            }
+                            else if (parentDocumentPaneGroup == null &&
+                                layoutDocumentPane != null &&
+                                layoutDocumentPane.ChildrenCount == 0)
+                            {
+                                _documentPaneFullDropTargetLeft.Visibility = Visibility.Hidden;
+                                _documentPaneFullDropTargetRight.Visibility = Visibility.Hidden;
+                                _documentPaneFullDropTargetTop.Visibility = Visibility.Hidden;
+                                _documentPaneFullDropTargetBottom.Visibility = Visibility.Hidden;
+                            }
+                            else
+                            {
+                                _documentPaneFullDropTargetLeft.Visibility = Visibility.Visible;
+                                _documentPaneFullDropTargetRight.Visibility = Visibility.Visible;
+                                _documentPaneFullDropTargetTop.Visibility = Visibility.Visible;
+                                _documentPaneFullDropTargetBottom.Visibility = Visibility.Visible;
+                            }
+
+                            if (parentDocumentPaneGroup != null &&
+                                parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1)
+                            {
+                                int indexOfDocumentPane = parentDocumentPaneGroup.Children.Where(ch => ch.IsVisible).ToList().IndexOf(layoutDocumentPane);
+                                bool isFirstChild = indexOfDocumentPane == 0;
+                                bool isLastChild = indexOfDocumentPane == parentDocumentPaneGroup.ChildrenCount - 1;
+
+                                var manager = parentDocumentPaneGroup.Root.Manager;
+                                if (!manager.AllowMixedOrientation)
+                                {
+                                    _documentPaneDropTargetBottomAsAnchorablePane.Visibility =
+                                    parentDocumentPaneGroup.Orientation == Orientation.Vertical ?
+                                        (isLastChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
+                                        System.Windows.Visibility.Hidden;
+                                    _documentPaneDropTargetTopAsAnchorablePane.Visibility =
+                                        parentDocumentPaneGroup.Orientation == Orientation.Vertical ?
+                                            (isFirstChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
+                                            System.Windows.Visibility.Hidden;
+
+                                    _documentPaneDropTargetLeftAsAnchorablePane.Visibility =
+                                        parentDocumentPaneGroup.Orientation == Orientation.Horizontal ?
+                                            (isFirstChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
+                                            System.Windows.Visibility.Hidden;
+
+
+                                    _documentPaneDropTargetRightAsAnchorablePane.Visibility =
+                                        parentDocumentPaneGroup.Orientation == Orientation.Horizontal ?
+                                            (isLastChild ? System.Windows.Visibility.Visible : System.Windows.Visibility.Hidden) :
+                                            System.Windows.Visibility.Hidden;
+                                }
+                                else
+                                {
+                                    _documentPaneDropTargetBottomAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                    _documentPaneDropTargetLeftAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                    _documentPaneDropTargetRightAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                    _documentPaneDropTargetTopAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                }
+                            }
+                            else
+                            {
+                                _documentPaneDropTargetBottomAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                _documentPaneDropTargetLeftAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                _documentPaneDropTargetRightAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                                _documentPaneDropTargetTopAsAnchorablePane.Visibility = System.Windows.Visibility.Visible;
+                            }
+                        }
+                        else
+                        {
+                            areaElement = _gridDocumentPaneDropTargets;
+                            var dropAreaDocumentPaneGroup = area as DropArea<LayoutDocumentPaneControl>;
+                            var layoutDocumentPane = dropAreaDocumentPaneGroup.AreaElement.Model as LayoutDocumentPane;
+                            var parentDocumentPaneGroup = layoutDocumentPane.Parent as LayoutDocumentPaneGroup;
+
+                            if (parentDocumentPaneGroup != null &&
+                                parentDocumentPaneGroup.Children.Where(c => c.IsVisible).Count() > 1)
+                            {
+                                var manager = parentDocumentPaneGroup.Root.Manager;
+                                if (!manager.AllowMixedOrientation)
+                                {
+                                    _documentPaneDropTargetLeft.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Horizontal ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneDropTargetRight.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Horizontal ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneDropTargetTop.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Vertical ? Visibility.Visible : Visibility.Hidden;
+                                    _documentPaneDropTargetBottom.Visibility = parentDocumentPaneGroup.Orientation == Orientation.Vertical ? Visibility.Visible : Visibility.Hidden;
+                                }
+                                else
+                                {
+                                    _documentPaneDropTargetLeft.Visibility = Visibility.Visible;
+                                    _documentPaneDropTargetRight.Visibility = Visibility.Visible;
+                                    _documentPaneDropTargetTop.Visibility = Visibility.Visible;
+                                    _documentPaneDropTargetBottom.Visibility = Visibility.Visible;
+                                }
+
+                            }
+                            else if (parentDocumentPaneGroup == null &&
+                                layoutDocumentPane != null &&
+                                layoutDocumentPane.ChildrenCount == 0)
+                            {
+                                _documentPaneDropTargetLeft.Visibility = Visibility.Hidden;
+                                _documentPaneDropTargetRight.Visibility = Visibility.Hidden;
+                                _documentPaneDropTargetTop.Visibility = Visibility.Hidden;
+                                _documentPaneDropTargetBottom.Visibility = Visibility.Hidden;
+                            }
+                            else
+                            {
+                                _documentPaneDropTargetLeft.Visibility = Visibility.Visible;
+                                _documentPaneDropTargetRight.Visibility = Visibility.Visible;
+                                _documentPaneDropTargetTop.Visibility = Visibility.Visible;
+                                _documentPaneDropTargetBottom.Visibility = Visibility.Visible;
+                            }
+                        }
+                    }
+                    break;
+            }
+
+            Canvas.SetLeft(areaElement, area.DetectionRect.Left - Left);
+            Canvas.SetTop(areaElement, area.DetectionRect.Top - Top);
+            areaElement.Width = area.DetectionRect.Width;
+            areaElement.Height = area.DetectionRect.Height;
+            areaElement.Visibility = System.Windows.Visibility.Visible;
+        }
+
+        void IOverlayWindow.DragLeave(IDropArea area)
+        {
+            _visibleAreas.Remove(area);
+
+            FrameworkElement areaElement;
+            switch (area.Type)
+            {
+                case DropAreaType.DockingManager:
+                    areaElement = _gridDockingManagerDropTargets;
+                    break;
+                case DropAreaType.AnchorablePane:
+                    areaElement = _gridAnchorablePaneDropTargets;
+                    break;
+                case DropAreaType.DocumentPaneGroup:
+                    areaElement = _gridDocumentPaneDropTargets;
+                    break;
+                case DropAreaType.DocumentPane:
+                default:
+                    {
+                        bool isDraggingAnchorables = _floatingWindow.Model is LayoutAnchorableFloatingWindow;
+                        if (isDraggingAnchorables && _gridDocumentPaneFullDropTargets != null)
+                            areaElement = _gridDocumentPaneFullDropTargets;
+                        else
+                            areaElement = _gridDocumentPaneDropTargets;
+                    }
+                    break;
+            }
+
+            areaElement.Visibility = System.Windows.Visibility.Hidden;
+        }
+
+        void IOverlayWindow.DragEnter(IDropTarget target)
+        {
+            var previewBoxPath = target.GetPreviewPath(this, _floatingWindow.Model as LayoutFloatingWindow);
+            if (previewBoxPath != null)
+            {
+                _previewBox.Data = previewBoxPath;
+                _previewBox.Visibility = System.Windows.Visibility.Visible;
+            }
+        }
+
+        void IOverlayWindow.DragLeave(IDropTarget target)
+        {
+            _previewBox.Visibility = System.Windows.Visibility.Hidden;
+        }
+
+        void IOverlayWindow.DragDrop(IDropTarget target)
+        {
+            target.Drop(_floatingWindow.Model as LayoutFloatingWindow);
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
new file mode 100644
index 000000000..50b0468df
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
@@ -0,0 +1,55 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public class OverlayWindowDropTarget : IOverlayWindowDropTarget
+    {
+        internal OverlayWindowDropTarget(IOverlayWindowArea overlayArea, OverlayWindowDropTargetType targetType, FrameworkElement element)
+        {
+            _overlayArea = overlayArea;
+            _type = targetType;
+            _screenDetectionArea = new Rect(element.TransformToDeviceDPI(new Point()), element.TransformActualSizeToAncestor());
+        }
+
+        IOverlayWindowArea _overlayArea;
+
+        Rect _screenDetectionArea;
+        Rect IOverlayWindowDropTarget.ScreenDetectionArea
+        {
+            get
+            {
+                return _screenDetectionArea;
+            }
+
+        }
+
+        OverlayWindowDropTargetType _type;
+        OverlayWindowDropTargetType IOverlayWindowDropTarget.Type
+        {
+            get { return _type; }
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
new file mode 100644
index 000000000..72e7a8c66
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
@@ -0,0 +1,44 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    public enum OverlayWindowDropTargetType
+    {
+        DockingManagerDockLeft,
+        DockingManagerDockTop,
+        DockingManagerDockRight,
+        DockingManagerDockBottom,
+
+        DocumentPaneDockLeft,
+        DocumentPaneDockTop,
+        DocumentPaneDockRight,
+        DocumentPaneDockBottom,
+        DocumentPaneDockInside,
+
+        AnchorablePaneDockLeft,
+        AnchorablePaneDockTop,
+        AnchorablePaneDockRight,
+        AnchorablePaneDockBottom,
+        AnchorablePaneDockInside,
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
new file mode 100644
index 000000000..d37b569dc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
@@ -0,0 +1,56 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class ReentrantFlag
+    {
+        public class _ReentrantFlagHandler : IDisposable
+        {
+            ReentrantFlag _owner;
+            public _ReentrantFlagHandler(ReentrantFlag owner)
+            {
+                _owner = owner;
+                _owner._flag = true;
+            }
+
+            public void Dispose()
+            {
+                _owner._flag = false;
+            }
+        }
+
+        bool _flag = false;
+
+        public _ReentrantFlagHandler Enter()
+        { 
+            if (_flag)
+                throw new InvalidOperationException();
+            return new _ReentrantFlagHandler(this);
+        }
+
+        public bool CanEnter
+        {
+            get { return !_flag; }
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
new file mode 100644
index 000000000..c84fbb182
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
@@ -0,0 +1,111 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    internal static partial class IID
+    {
+        /// <summary>IID_IEnumIDList</summary>
+        public const string EnumIdList = "000214F2-0000-0000-C000-000000000046";
+        /// <summary>IID_IEnumObjects</summary>
+        public const string EnumObjects = "2c1c7e2e-2d0e-4059-831e-1e6f82335c2e";
+        /// <summary>IID_IHTMLDocument2</summary>
+        public const string HtmlDocument2 = "332C4425-26CB-11D0-B483-00C04FD90119";
+        /// <summary>IID_IModalWindow</summary>
+        public const string ModalWindow = "b4db1657-70d7-485e-8e3e-6fcb5a5c1802";
+        /// <summary>IID_IObjectArray</summary>
+        public const string ObjectArray = "92CA9DCD-5622-4bba-A805-5E9F541BD8C9";
+        /// <summary>IID_IObjectCollection</summary>
+        public const string ObjectCollection = "5632b1a4-e38a-400a-928a-d4cd63230295";
+        /// <summary>IID_IPropertyNotifySink</summary>
+        public const string PropertyNotifySink = "9BFBBC02-EFF1-101A-84ED-00AA00341D07";
+        /// <summary>IID_IPropertyStore</summary>
+        public const string PropertyStore = "886d8eeb-8cf2-4446-8d02-cdba1dbdcf99";
+        /// <summary>IID_IServiceProvider</summary>
+        public const string ServiceProvider = "6d5140c1-7436-11ce-8034-00aa006009fa";
+        /// <summary>IID_IShellFolder</summary>
+        public const string ShellFolder = "000214E6-0000-0000-C000-000000000046";
+        /// <summary>IID_IShellLink</summary>
+        public const string ShellLink = "000214F9-0000-0000-C000-000000000046";
+        /// <summary>IID_IShellItem</summary>
+        public const string ShellItem = "43826d1e-e718-42ee-bc55-a1e261c37bfe";
+        /// <summary>IID_IShellItem2</summary>
+        public const string ShellItem2 = "7e9fb0d3-919f-4307-ab2e-9b1860310c93";
+        /// <summary>IID_IShellItemArray</summary>
+        public const string ShellItemArray = "B63EA76D-1F85-456F-A19C-48159EFA858B";
+        /// <summary>IID_ITaskbarList</summary>
+        public const string TaskbarList = "56FDF342-FD6D-11d0-958A-006097C9A090";
+        /// <summary>IID_ITaskbarList2</summary>
+        public const string TaskbarList2 = "602D4995-B13A-429b-A66E-1935E44F4317";
+        /// <summary>IID_IUnknown</summary>
+        public const string Unknown = "00000000-0000-0000-C000-000000000046";
+
+        #region Win7 IIDs
+
+        /// <summary>IID_IApplicationDestinations</summary>
+        public const string ApplicationDestinations = "12337d35-94c6-48a0-bce7-6a9c69d4d600";
+        /// <summary>IID_IApplicationDocumentLists</summary>
+        public const string ApplicationDocumentLists = "3c594f9f-9f30-47a1-979a-c9e83d3d0a06";
+        /// <summary>IID_ICustomDestinationList</summary>
+        public const string CustomDestinationList = "6332debf-87b5-4670-90c0-5e57b408a49e";
+        /// <summary>IID_IObjectWithAppUserModelID</summary>
+        public const string ObjectWithAppUserModelId = "36db0196-9665-46d1-9ba7-d3709eecf9ed";
+        /// <summary>IID_IObjectWithProgID</summary>
+        public const string ObjectWithProgId = "71e806fb-8dee-46fc-bf8c-7748a8a1ae13";
+        /// <summary>IID_ITaskbarList3</summary>
+        public const string TaskbarList3 = "ea1afb91-9e28-4b86-90e9-9e9f8a5eefaf";
+        /// <summary>IID_ITaskbarList4</summary>
+        public const string TaskbarList4 = "c43dc798-95d1-4bea-9030-bb99e2983a1a";
+
+        #endregion
+    }
+
+    internal static partial class CLSID
+    {
+        public static T CoCreateInstance<T>(string clsid)
+        {
+            return (T)System.Activator.CreateInstance(System.Type.GetTypeFromCLSID(new System.Guid(clsid)));
+        }
+
+        /// <summary>CLSID_TaskbarList</summary>
+        /// <remarks>IID_ITaskbarList</remarks>
+        public const string TaskbarList = "56FDF344-FD6D-11d0-958A-006097C9A090";
+        /// <summary>CLSID_EnumerableObjectCollection</summary>
+        /// <remarks>IID_IEnumObjects.</remarks>
+        public const string EnumerableObjectCollection = "2d3468c1-36a7-43b6-ac24-d3f02fd9607a";
+        /// <summary>CLSID_ShellLink</summary>
+        /// <remarks>IID_IShellLink</remarks>
+        public const string ShellLink = "00021401-0000-0000-C000-000000000046";
+
+        #region Win7 CLSIDs
+
+        /// <summary>CLSID_DestinationList</summary>
+        /// <remarks>IID_ICustomDestinationList</remarks>
+        public const string DestinationList = "77f10cf0-3db5-4966-b520-b7c54fd35ed6";
+        /// <summary>CLSID_ApplicationDestinations</summary>
+        /// <remarks>IID_IApplicationDestinations</remarks>
+        public const string ApplicationDestinations = "86c14003-4d6b-4ef3-a7b4-0506663b2e68";
+        /// <summary>CLSID_ApplicationDocumentLists</summary>
+        /// <remarks>IID_IApplicationDocumentLists</remarks>
+        public const string ApplicationDocumentLists = "86bec222-30f2-47e0-9f25-60d11cd75c28";
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
new file mode 100644
index 000000000..fb4dd759e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
@@ -0,0 +1,389 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+// Conditional to use more aggressive fail-fast behaviors when debugging.
+#define DEV_DEBUG
+
+// This file contains general utilities to aid in development.
+// It is distinct from unit test Assert classes.
+// Classes here generally shouldn't be exposed publicly since
+// they're not particular to any library functionality.
+// Because the classes here are internal, it's likely this file
+// might be included in multiple assemblies.
+namespace Standard
+{
+    using System;
+    using System.Diagnostics;
+    using System.Threading;
+
+    /// <summary>A static class for verifying assumptions.</summary>
+    internal static class Assert
+    {
+        private static void _Break()
+        {
+#if DEV_DEBUG
+            Debugger.Break();
+#else
+            Debug.Assert(false);
+#endif
+        }
+
+        /// <summary>A function signature for Assert.Evaluate.</summary>
+        public delegate void EvaluateFunction();
+
+        /// <summary>A function signature for Assert.Implies.</summary>
+        /// <returns>Returns the truth of a predicate.</returns>
+        public delegate bool ImplicationFunction();
+
+        /// <summary>
+        /// Executes the specified argument.
+        /// </summary>
+        /// <param name="argument">The function to execute.</param>
+        [Conditional("DEBUG")]
+        public static void Evaluate(EvaluateFunction argument)
+        {
+            IsNotNull(argument);
+            argument();
+        }
+
+        /// <summary>Obsolete: Use Standard.Assert.AreEqual instead of Assert.Equals</summary>
+        /// <typeparam name="T">The generic type to compare for equality.</typeparam>
+        /// <param name="expected">The first generic type data to compare.  This is is the expected value.</param>
+        /// <param name="actual">The second generic type data to compare.  This is the actual value.</param>
+        [
+            Obsolete("Use Assert.AreEqual instead of Assert.Equals", false),
+            Conditional("DEBUG")
+        ]
+        public static void Equals<T>(T expected, T actual)
+        {
+            AreEqual(expected, actual);
+        }
+
+        /// <summary>
+        /// Verifies that two generic type data are equal.  The assertion fails if they are not.
+        /// </summary>
+        /// <typeparam name="T">The generic type to compare for equality.</typeparam>
+        /// <param name="expected">The first generic type data to compare.  This is is the expected value.</param>
+        /// <param name="actual">The second generic type data to compare.  This is the actual value.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void AreEqual<T>(T expected, T actual)
+        {
+            if (null == expected)
+            {
+                // Two nulls are considered equal, regardless of type semantics.
+                if (null != actual && !actual.Equals(expected))
+                {
+                    _Break();
+                }
+            }
+            else if (!expected.Equals(actual))
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that two generic type data are not equal.  The assertion fails if they are.
+        /// </summary>
+        /// <typeparam name="T">The generic type to compare for inequality.</typeparam>
+        /// <param name="notExpected">The first generic type data to compare.  This is is the value that's not expected.</param>
+        /// <param name="actual">The second generic type data to compare.  This is the actual value.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void AreNotEqual<T>(T notExpected, T actual)
+        {
+            if (null == notExpected)
+            {
+                // Two nulls are considered equal, regardless of type semantics.
+                if (null == actual || actual.Equals(notExpected))
+                {
+                    _Break();
+                }
+            }
+            else if (notExpected.Equals(actual))
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that if the specified condition is true, then so is the result.
+        /// The assertion fails if the condition is true but the result is false.
+        /// </summary>
+        /// <param name="condition">if set to <c>true</c> [condition].</param>
+        /// <param name="result">
+        /// A second Boolean statement.  If the first was true then so must this be.
+        /// If the first statement was false then the value of this is ignored.
+        /// </param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void Implies(bool condition, bool result)
+        {
+            if (condition && !result)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Lazy evaluation overload.  Verifies that if a condition is true, then so is a secondary value.
+        /// </summary>
+        /// <param name="condition">The conditional value.</param>
+        /// <param name="result">A function to be evaluated for truth if the condition argument is true.</param>
+        /// <remarks>
+        /// This overload only evaluates the result if the first condition is true.
+        /// </remarks>
+        [Conditional("DEBUG")]
+        public static void Implies(bool condition, ImplicationFunction result)
+        {
+            if (condition && !result())
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that a string has content.  I.e. it is not null and it is not empty.
+        /// </summary>
+        /// <param name="value">The string to verify.</param>
+        [Conditional("DEBUG")]
+        public static void IsNeitherNullNorEmpty(string value)
+        {
+            IsFalse(string.IsNullOrEmpty(value));
+        }
+
+        /// <summary>
+        /// Verifies that a string has content.  I.e. it is not null and it is not purely whitespace.
+        /// </summary>
+        /// <param name="value">The string to verify.</param>
+        [Conditional("DEBUG")]
+        public static void IsNeitherNullNorWhitespace(string value)
+        {
+            if (string.IsNullOrEmpty(value))
+            {
+                _Break();
+            }
+
+            if (value.Trim().Length == 0)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies the specified value is not null.  The assertion fails if it is.
+        /// </summary>
+        /// <typeparam name="T">The generic reference type.</typeparam>
+        /// <param name="value">The value to check for nullness.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsNotNull<T>(T value) where T : class
+        {
+            if (null == value)
+            {
+                _Break();
+            }
+        }
+
+        [Conditional("DEBUG")]
+        public static void IsDefault<T>(T value) where T : struct
+        {
+            if (!value.Equals(default(T)))
+            {
+                Assert.Fail();
+            }
+        }
+
+        [Conditional("DEBUG")]
+        public static void IsNotDefault<T>(T value) where T : struct
+        {
+            if (value.Equals(default(T)))
+            {
+                Assert.Fail();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified condition is false.  The assertion fails if it is true.
+        /// </summary>
+        /// <param name="condition">The expression that should be <c>false</c>.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsFalse(bool condition)
+        {
+            if (condition)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified condition is false.  The assertion fails if it is true.
+        /// </summary>
+        /// <param name="condition">The expression that should be <c>false</c>.</param>
+        /// <param name="message">The message to display if the condition is <c>true</c>.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsFalse(bool condition, string message)
+        {
+            if (condition)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified condition is true.  The assertion fails if it is not.
+        /// </summary>
+        /// <param name="condition">A condition that is expected to be <c>true</c>.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsTrue(bool condition)
+        {
+            if (!condition)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified condition is true.  The assertion fails if it is not.
+        /// </summary>
+        /// <param name="condition">A condition that is expected to be <c>true</c>.</param>
+        /// <param name="message">The message to write in case the condition is <c>false</c>.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsTrue(bool condition, string message)
+        {
+            if (!condition)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// This line should never be executed.  The assertion always fails.
+        /// </summary>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void Fail()
+        {
+            _Break();
+        }
+
+        /// <summary>
+        /// This line should never be executed.  The assertion always fails.
+        /// </summary>
+        /// <param name="message">The message to display if this function is executed.</param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void Fail(string message)
+        {
+            _Break();
+        }
+
+        /// <summary>
+        /// Verifies that the specified object is null.  The assertion fails if it is not.
+        /// </summary>
+        /// <param name="item">The item to verify is null.</param>
+        [Conditional("DEBUG")]
+        public static void IsNull<T>(T item) where T : class
+        {
+            if (null != item)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified value is within the expected range.  The assertion fails if it isn't.
+        /// </summary>
+        /// <param name="lowerBoundInclusive">The lower bound inclusive value.</param>
+        /// <param name="value">The value to verify.</param>
+        /// <param name="upperBoundInclusive">The upper bound inclusive value.</param>
+        [Conditional("DEBUG")]
+        public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive)
+        {
+            if (value < lowerBoundInclusive || value > upperBoundInclusive)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified value is within the expected range.  The assertion fails if it isn't.
+        /// </summary>
+        /// <param name="lowerBoundInclusive">The lower bound inclusive value.</param>
+        /// <param name="value">The value to verify.</param>
+        /// <param name="upperBoundExclusive">The upper bound exclusive value.</param>
+        [Conditional("DEBUG")]
+        public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive)
+        {
+            if (value < lowerBoundInclusive || value >= upperBoundExclusive)
+            {
+                _Break();
+            }
+        }
+
+        /// <summary>
+        /// Verify the current thread's apartment state is what's expected.  The assertion fails if it isn't
+        /// </summary>
+        /// <param name="expectedState">
+        /// The expected apartment state for the current thread.
+        /// </param>
+        /// <remarks>This breaks into the debugger in the case of a failed assertion.</remarks>
+        [Conditional("DEBUG")]
+        public static void IsApartmentState(ApartmentState expectedState)
+        {
+            if (Thread.CurrentThread.GetApartmentState() != expectedState)
+            {
+                _Break();
+            }
+        }
+
+        [Conditional("DEBUG")]
+        public static void NullableIsNotNull<T>(T? value) where T : struct
+        {
+            if (null == value)
+            {
+                _Break();
+            }
+        }
+
+        [Conditional("DEBUG")]
+        public static void NullableIsNull<T>(T? value) where T : struct
+        {
+            if (null != value)
+            {
+                _Break();
+            }
+        }
+
+        [Conditional("DEBUG")]
+        public static void IsNotOnMainThread()
+        {
+            if (System.Windows.Application.Current.Dispatcher.CheckAccess())
+            {
+                _Break();
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
new file mode 100644
index 000000000..29e25ee5a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
@@ -0,0 +1,148 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Standard
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+
+    /// <summary>
+    /// DoubleUtil uses fixed eps to provide fuzzy comparison functionality for doubles.
+    /// Note that FP noise is a big problem and using any of these compare 
+    /// methods is not a complete solution, but rather the way to reduce 
+    /// the probability of repeating unnecessary work.
+    /// </summary>
+    internal static class DoubleUtilities
+    {
+        /// <summary>
+        /// Epsilon - more or less random, more or less small number.
+        /// </summary>
+        private const double Epsilon = 0.00000153;
+
+        /// <summary>
+        /// AreClose returns whether or not two doubles are "close".  That is, whether or 
+        /// not they are within epsilon of each other.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this 
+        /// returns false. 
+        /// </summary>
+        /// <param name="value1">The first double to compare.</param>
+        /// <param name="value2">The second double to compare.</param>
+        /// <returns>The result of the AreClose comparision.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool AreClose(double value1, double value2)
+        {
+            if (value1 == value2)
+            {
+                return true;
+            }
+
+            double delta = value1 - value2;
+            return (delta < Epsilon) && (delta > -Epsilon);
+        }
+
+        /// <summary>
+        /// LessThan returns whether or not the first double is less than the second double.
+        /// That is, whether or not the first is strictly less than *and* not within epsilon of
+        /// the other number.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this 
+        /// returns false.
+        /// </summary>
+        /// <param name="value1">The first double to compare.</param>
+        /// <param name="value2">The second double to compare.</param>
+        /// <returns>The result of the LessThan comparision.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool LessThan(double value1, double value2)
+        {
+            return (value1 < value2) && !AreClose(value1, value2);
+        }
+
+        /// <summary>
+        /// GreaterThan returns whether or not the first double is greater than the second double.
+        /// That is, whether or not the first is strictly greater than *and* not within epsilon of
+        /// the other number.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this 
+        /// returns false.
+        /// </summary>
+        /// <param name="value1">The first double to compare.</param>
+        /// <param name="value2">The second double to compare.</param>
+        /// <returns>The result of the GreaterThan comparision.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool GreaterThan(double value1, double value2)
+        {
+            return (value1 > value2) && !AreClose(value1, value2);
+        }
+
+        /// <summary>
+        /// LessThanOrClose returns whether or not the first double is less than or close to
+        /// the second double.  That is, whether or not the first is strictly less than or within
+        /// epsilon of the other number.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this 
+        /// returns false.
+        /// </summary>
+        /// <param name="value1">The first double to compare.</param>
+        /// <param name="value2">The second double to compare.</param>
+        /// <returns>The result of the LessThanOrClose comparision.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool LessThanOrClose(double value1, double value2)
+        {
+            return (value1 < value2) || AreClose(value1, value2);
+        }
+
+        /// <summary>
+        /// GreaterThanOrClose returns whether or not the first double is greater than or close to
+        /// the second double.  That is, whether or not the first is strictly greater than or within
+        /// epsilon of the other number.
+        /// There are plenty of ways for this to return false even for numbers which
+        /// are theoretically identical, so no code calling this should fail to work if this 
+        /// returns false.
+        /// </summary>
+        /// <param name="value1">The first double to compare.</param>
+        /// <param name="value2">The second double to compare.</param>
+        /// <returns>The result of the GreaterThanOrClose comparision.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool GreaterThanOrClose(double value1, double value2)
+        {
+            return (value1 > value2) || AreClose(value1, value2);
+        }
+
+        /// <summary>
+        /// Test to see if a double is a finite number (is not NaN or Infinity).
+        /// </summary>
+        /// <param name='value'>The value to test.</param>
+        /// <returns>Whether or not the value is a finite number.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsFinite(double value)
+        {
+            return !double.IsNaN(value) && !double.IsInfinity(value);
+        }
+
+        /// <summary>
+        /// Test to see if a double a valid size value (is finite and > 0).
+        /// </summary>
+        /// <param name='value'>The value to test.</param>
+        /// <returns>Whether or not the value is a valid size value.</returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsValidSize(double value)
+        {
+            return IsFinite(value) && GreaterThanOrClose(value, 0);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
new file mode 100644
index 000000000..983980980
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
@@ -0,0 +1,102 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Windows;
+    using System.Windows.Media;
+
+    internal static class DpiHelper
+    {
+        private static Matrix _transformToDevice;
+        private static Matrix _transformToDip;
+
+        [SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]
+        static DpiHelper()
+        {
+            using (SafeDC desktop = SafeDC.GetDesktop())
+            {
+                // Can get these in the static constructor.  They shouldn't vary window to window,
+                // and changing the system DPI requires a restart.
+                int pixelsPerInchX = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSX);
+                int pixelsPerInchY = NativeMethods.GetDeviceCaps(desktop, DeviceCap.LOGPIXELSY);
+
+                _transformToDip = Matrix.Identity;
+                _transformToDip.Scale(96d / (double)pixelsPerInchX, 96d / (double)pixelsPerInchY);
+                _transformToDevice = Matrix.Identity;
+                _transformToDevice.Scale((double)pixelsPerInchX / 96d, (double)pixelsPerInchY / 96d);
+            }
+        }
+
+        /// <summary>
+        /// Convert a point in device independent pixels (1/96") to a point in the system coordinates.
+        /// </summary>
+        /// <param name="logicalPoint">A point in the logical coordinate system.</param>
+        /// <returns>Returns the parameter converted to the system's coordinates.</returns>
+        public static Point LogicalPixelsToDevice(Point logicalPoint)
+        {
+            return _transformToDevice.Transform(logicalPoint);
+        }
+
+        /// <summary>
+        /// Convert a point in system coordinates to a point in device independent pixels (1/96").
+        /// </summary>
+        /// <param name="logicalPoint">A point in the physical coordinate system.</param>
+        /// <returns>Returns the parameter converted to the device independent coordinate system.</returns>
+        public static Point DevicePixelsToLogical(Point devicePoint)
+        {
+            return _transformToDip.Transform(devicePoint);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static Rect LogicalRectToDevice(Rect logicalRectangle)
+        {
+            Point topLeft = LogicalPixelsToDevice(new Point(logicalRectangle.Left, logicalRectangle.Top));
+            Point bottomRight = LogicalPixelsToDevice(new Point(logicalRectangle.Right, logicalRectangle.Bottom));
+
+            return new Rect(topLeft, bottomRight);
+        }
+
+        public static Rect DeviceRectToLogical(Rect deviceRectangle)
+        {
+            Point topLeft = DevicePixelsToLogical(new Point(deviceRectangle.Left, deviceRectangle.Top));
+            Point bottomRight = DevicePixelsToLogical(new Point(deviceRectangle.Right, deviceRectangle.Bottom));
+
+            return new Rect(topLeft, bottomRight);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static Size LogicalSizeToDevice(Size logicalSize)
+        {
+            Point pt = LogicalPixelsToDevice(new Point(logicalSize.Width, logicalSize.Height));
+
+            return new Size { Width = pt.X, Height = pt.Y };
+        }
+
+        public static Size DeviceSizeToLogical(Size deviceSize)
+        {
+            Point pt = DevicePixelsToLogical(new Point(deviceSize.Width, deviceSize.Height));
+
+            return new Size(pt.X, pt.Y);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
new file mode 100644
index 000000000..24e9fb5a2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
@@ -0,0 +1,524 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.ComponentModel;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+
+    /// <summary>
+    /// Wrapper for common Win32 status codes.
+    /// </summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct Win32Error
+    {
+        [FieldOffset(0)]
+        private readonly int _value;
+
+        // NOTE: These public static field declarations are automatically
+        // picked up by (HRESULT's) ToString through reflection.
+
+        /// <summary>The operation completed successfully.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_SUCCESS = new Win32Error(0);
+        /// <summary>Incorrect function.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_INVALID_FUNCTION = new Win32Error(1);
+        /// <summary>The system cannot find the file specified.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_FILE_NOT_FOUND = new Win32Error(2);
+        /// <summary>The system cannot find the path specified.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_PATH_NOT_FOUND = new Win32Error(3);
+        /// <summary>The system cannot open the file.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_TOO_MANY_OPEN_FILES = new Win32Error(4);
+        /// <summary>Access is denied.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_ACCESS_DENIED = new Win32Error(5);
+        /// <summary>The handle is invalid.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_INVALID_HANDLE = new Win32Error(6);
+        /// <summary>Not enough storage is available to complete this operation.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_OUTOFMEMORY = new Win32Error(14);
+        /// <summary>There are no more files.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_NO_MORE_FILES = new Win32Error(18);
+        /// <summary>The process cannot access the file because it is being used by another process.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_SHARING_VIOLATION = new Win32Error(32);
+        /// <summary>The parameter is incorrect.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_INVALID_PARAMETER = new Win32Error(87);
+        /// <summary>The data area passed to a system call is too small.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_INSUFFICIENT_BUFFER = new Win32Error(122);
+        /// <summary>Cannot nest calls to LoadModule.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_NESTING_NOT_ALLOWED = new Win32Error(215);
+        /// <summary>Illegal operation attempted on a registry key that has been marked for deletion.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_KEY_DELETED = new Win32Error(1018);
+        /// <summary>Element not found.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_NOT_FOUND = new Win32Error(1168);
+        /// <summary>There was no match for the specified key in the index.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_NO_MATCH = new Win32Error(1169);
+        /// <summary>An invalid device was specified.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_BAD_DEVICE = new Win32Error(1200);
+        /// <summary>The operation was canceled by the user.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_CANCELLED = new Win32Error(1223);
+        /// <summary>The window class was already registered.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_CLASS_ALREADY_EXISTS = new Win32Error(1410);
+        /// <summary>The specified datatype is invalid.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly Win32Error ERROR_INVALID_DATATYPE = new Win32Error(1804);
+
+        /// <summary>
+        /// Create a new Win32 error.
+        /// </summary>
+        /// <param name="i">The integer value of the error.</param>
+        public Win32Error(int i)
+        {
+            _value = i;
+        }
+
+        /// <summary>Performs HRESULT_FROM_WIN32 conversion.</summary>
+        /// <param name="error">The Win32 error being converted to an HRESULT.</param>
+        /// <returns>The equivilent HRESULT value.</returns>
+        public static explicit operator HRESULT(Win32Error error)
+        {
+            // #define __HRESULT_FROM_WIN32(x) 
+            //     ((HRESULT)(x) <= 0 ? ((HRESULT)(x)) : ((HRESULT) (((x) & 0x0000FFFF) | (FACILITY_WIN32 << 16) | 0x80000000)))
+            if (error._value <= 0)
+            {
+                return new HRESULT((uint)error._value);
+            }
+            return HRESULT.Make(true, Facility.Win32, error._value & 0x0000FFFF);
+        }
+
+        // Method version of the cast operation
+        /// <summary>Performs HRESULT_FROM_WIN32 conversion.</summary>
+        /// <param name="error">The Win32 error being converted to an HRESULT.</param>
+        /// <returns>The equivilent HRESULT value.</returns>
+        public HRESULT ToHRESULT()
+        {
+            return (HRESULT)this; 
+        }
+
+        /// <summary>Performs the equivalent of Win32's GetLastError()</summary>
+        /// <returns>A Win32Error instance with the result of the native GetLastError</returns>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static Win32Error GetLastError()
+        {
+            return new Win32Error(Marshal.GetLastWin32Error());
+        }
+
+        public override bool Equals(object obj)
+        {
+            try
+            {
+                return ((Win32Error)obj)._value == _value;
+            }
+            catch (InvalidCastException)
+            {
+                return false;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return _value.GetHashCode();
+        }
+
+        /// <summary>
+        /// Compare two Win32 error codes for equality.
+        /// </summary>
+        /// <param name="errLeft">The first error code to compare.</param>
+        /// <param name="errRight">The second error code to compare.</param>
+        /// <returns>Whether the two error codes are the same.</returns>
+        public static bool operator ==(Win32Error errLeft, Win32Error errRight)
+        {
+            return errLeft._value == errRight._value;
+        }
+
+        /// <summary>
+        /// Compare two Win32 error codes for inequality.
+        /// </summary>
+        /// <param name="errLeft">The first error code to compare.</param>
+        /// <param name="errRight">The second error code to compare.</param>
+        /// <returns>Whether the two error codes are not the same.</returns>
+        public static bool operator !=(Win32Error errLeft, Win32Error errRight)
+        {
+            return !(errLeft == errRight);
+        }
+    }
+
+    internal enum Facility
+    {
+        /// <summary>FACILITY_NULL</summary>
+        Null = 0,
+        /// <summary>FACILITY_RPC</summary>
+        Rpc = 1,
+        /// <summary>FACILITY_DISPATCH</summary>
+        Dispatch = 2,
+        /// <summary>FACILITY_STORAGE</summary>
+        Storage = 3,
+        /// <summary>FACILITY_ITF</summary>
+        Itf = 4,
+        /// <summary>FACILITY_WIN32</summary>
+        Win32 = 7,
+        /// <summary>FACILITY_WINDOWS</summary>
+        Windows = 8,
+        /// <summary>FACILITY_CONTROL</summary>
+        Control = 10,
+        /// <summary>MSDN doced facility code for ESE errors.</summary>
+        Ese = 0xE5E,
+        /// <summary>FACILITY_WINCODEC (WIC)</summary>
+        WinCodec = 0x898,
+    }
+
+    /// <summary>Wrapper for HRESULT status codes.</summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct HRESULT
+    {
+        [FieldOffset(0)]
+        private readonly uint _value;
+
+        // NOTE: These public static field declarations are automatically
+        // picked up by ToString through reflection.
+        /// <summary>S_OK</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT S_OK = new HRESULT(0x00000000);
+        /// <summary>S_FALSE</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT S_FALSE = new HRESULT(0x00000001);
+        /// <summary>E_PENDING</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_PENDING = new HRESULT(0x8000000A);
+        /// <summary>E_NOTIMPL</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_NOTIMPL = new HRESULT(0x80004001);
+        /// <summary>E_NOINTERFACE</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_NOINTERFACE = new HRESULT(0x80004002);
+        /// <summary>E_POINTER</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_POINTER = new HRESULT(0x80004003);
+        /// <summary>E_ABORT</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_ABORT = new HRESULT(0x80004004);
+        /// <summary>E_FAIL</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_FAIL = new HRESULT(0x80004005);
+        /// <summary>E_UNEXPECTED</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_UNEXPECTED = new HRESULT(0x8000FFFF);
+        /// <summary>STG_E_INVALIDFUNCTION</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT STG_E_INVALIDFUNCTION = new HRESULT(0x80030001);
+        /// <summary>REGDB_E_CLASSNOTREG</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT REGDB_E_CLASSNOTREG = new HRESULT(0x80040154);
+
+        /// <summary>DESTS_E_NO_MATCHING_ASSOC_HANDLER.  Win7 internal error code for Jump Lists.</summary>
+        /// <remarks>There is no Assoc Handler for the given item registered by the specified application.</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT DESTS_E_NO_MATCHING_ASSOC_HANDLER = new HRESULT(0x80040F03);
+        /// <summary>DESTS_E_NORECDOCS.  Win7 internal error code for Jump Lists.</summary>
+        /// <remarks>The given item is excluded from the recent docs folder by the NoRecDocs bit on its registration.</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT DESTS_E_NORECDOCS = new HRESULT(0x80040F04);
+        /// <summary>DESTS_E_NOTALLCLEARED.  Win7 internal error code for Jump Lists.</summary>
+        /// <remarks>Not all of the items were successfully cleared</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT DESTS_E_NOTALLCLEARED = new HRESULT(0x80040F05);
+
+        /// <summary>E_ACCESSDENIED</summary>
+        /// <remarks>Win32Error ERROR_ACCESS_DENIED.</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_ACCESSDENIED = new HRESULT(0x80070005);
+        /// <summary>E_OUTOFMEMORY</summary>
+        /// <remarks>Win32Error ERROR_OUTOFMEMORY.</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_OUTOFMEMORY = new HRESULT(0x8007000E);
+        /// <summary>E_INVALIDARG</summary>
+        /// <remarks>Win32Error ERROR_INVALID_PARAMETER.</remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT E_INVALIDARG = new HRESULT(0x80070057);
+        /// <summary>INTSAFE_E_ARITHMETIC_OVERFLOW</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT INTSAFE_E_ARITHMETIC_OVERFLOW = new HRESULT(0x80070216);
+        /// <summary>COR_E_OBJECTDISPOSED</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT COR_E_OBJECTDISPOSED = new HRESULT(0x80131622);
+        /// <summary>WC_E_GREATERTHAN</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT WC_E_GREATERTHAN = new HRESULT(0xC00CEE23);
+        /// <summary>WC_E_SYNTAX</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        public static readonly HRESULT WC_E_SYNTAX = new HRESULT(0xC00CEE2D);
+
+        /// <summary>
+        /// Create an HRESULT from an integer value.
+        /// </summary>
+        /// <param name="i"></param>
+        public HRESULT(uint i)
+        {
+            _value = i;
+        }
+
+        public static HRESULT Make(bool severe, Facility facility, int code)
+        {
+            // #define MAKE_HRESULT(sev,fac,code) \
+            //    ((HRESULT) (((unsigned long)(sev)<<31) | ((unsigned long)(fac)<<16) | ((unsigned long)(code))) )
+
+            // Severity has 1 bit reserved.
+            // bitness is enforced by the boolean parameter.
+
+            // Facility has 11 bits reserved (different than SCODES, which have 4 bits reserved)
+            // MSDN documentation incorrectly uses 12 bits for the ESE facility (e5e), so go ahead and let that one slide.
+            // And WIC also ignores it the documented size...
+            Assert.Implies((int)facility != (int)((int)facility & 0x1FF), facility == Facility.Ese || facility == Facility.WinCodec);
+            // Code has 4 bits reserved.
+            Assert.AreEqual(code, code & 0xFFFF);
+
+            return new HRESULT((uint)((severe ? (1 << 31) : 0) | ((int)facility << 16) | code));
+        }
+
+        /// <summary>
+        /// retrieve HRESULT_FACILITY
+        /// </summary>
+        public Facility Facility
+        {
+            get
+            {
+                return GetFacility((int)_value);
+            }
+        }
+
+        public static Facility GetFacility(int errorCode)
+        {
+            // #define HRESULT_FACILITY(hr)  (((hr) >> 16) & 0x1fff)
+            return (Facility)((errorCode >> 16) & 0x1fff);
+        }
+
+        /// <summary>
+        /// retrieve HRESULT_CODE
+        /// </summary>
+        public int Code
+        {
+            get
+            {
+                return GetCode((int)_value);
+            }
+        }
+
+        public static int GetCode(int error)
+        {
+            // #define HRESULT_CODE(hr)    ((hr) & 0xFFFF)
+            return (int)(error & 0xFFFF);
+        }
+
+        #region Object class override members
+
+        /// <summary>
+        /// Get a string representation of this HRESULT.
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            // Use reflection to try to name this HRESULT.
+            // This is expensive, but if someone's ever printing HRESULT strings then
+            // I think it's a fair guess that they're not in a performance critical area
+            // (e.g. printing exception strings).
+            // This is less error prone than trying to keep the list in the function.
+            // To properly add an HRESULT's name to the ToString table, just add the HRESULT
+            // like all the others above.
+            //
+            // CONSIDER: This data is static.  It could be cached 
+            // after first usage for fast lookup since the keys are unique.
+            //
+            foreach (FieldInfo publicStaticField in typeof(HRESULT).GetFields(BindingFlags.Static | BindingFlags.Public))
+            {
+                if (publicStaticField.FieldType == typeof(HRESULT))
+                {
+                    var hr = (HRESULT)publicStaticField.GetValue(null);
+                    if (hr == this)
+                    {
+                        return publicStaticField.Name;
+                    }
+                }
+            }
+
+            // Try Win32 error codes also
+            if (Facility == Facility.Win32)
+            {
+                foreach (FieldInfo publicStaticField in typeof(Win32Error).GetFields(BindingFlags.Static | BindingFlags.Public))
+                {
+                    if (publicStaticField.FieldType == typeof(Win32Error))
+                    {
+                        var error = (Win32Error)publicStaticField.GetValue(null);
+                        if ((HRESULT)error == this)
+                        {
+                            return "HRESULT_FROM_WIN32(" + publicStaticField.Name + ")";
+                        }
+                    }
+                }
+            }
+
+            // If there's no good name for this HRESULT,
+            // return the string as readable hex (0x########) format.
+            return string.Format(CultureInfo.InvariantCulture, "0x{0:X8}", _value);
+        }
+
+        public override bool Equals(object obj)
+        {
+            try
+            {
+                return ((HRESULT)obj)._value == _value;
+            }
+            catch (InvalidCastException)
+            {
+                return false;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return _value.GetHashCode();
+        }
+
+        #endregion
+
+        public static bool operator ==(HRESULT hrLeft, HRESULT hrRight)
+        {
+            return hrLeft._value == hrRight._value;
+        }
+
+        public static bool operator !=(HRESULT hrLeft, HRESULT hrRight)
+        {
+            return !(hrLeft == hrRight);
+        }
+
+        public bool Succeeded
+        {
+            get { return (int)_value >= 0; }
+        }
+
+        public bool Failed
+        {
+            get { return (int)_value < 0; }
+        }
+
+        public void ThrowIfFailed()
+        {
+            ThrowIfFailed(null);
+        }
+
+        [
+            SuppressMessage(
+                "Microsoft.Usage",
+                "CA2201:DoNotRaiseReservedExceptionTypes",
+                Justification="Only recreating Exceptions that were already raised."),
+            SuppressMessage(
+                "Microsoft.Security",
+                "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")
+        ]
+        public void ThrowIfFailed(string message)
+        {
+            if (Failed)
+            {
+                if (string.IsNullOrEmpty(message))
+                {
+                    message = ToString();
+                }
+#if DEBUG
+                else
+                {
+                    message += " (" + ToString() + ")";
+                }
+#endif
+                // Wow.  Reflection in a throw call.  Later on this may turn out to have been a bad idea.
+                // If you're throwing an exception I assume it's OK for me to take some time to give it back.
+                // I want to convert the HRESULT to a more appropriate exception type than COMException.
+                // Marshal.ThrowExceptionForHR does this for me, but the general call uses GetErrorInfo
+                // if it's set, and then ignores the HRESULT that I've provided.  This makes it so this
+                // call works the first time but you get burned on the second.  To avoid this, I use
+                // the overload that explicitly ignores the IErrorInfo.
+                // In addition, the function doesn't allow me to set the Message unless I go through
+                // the process of implementing an IErrorInfo and then use that.  There's no stock
+                // implementations of IErrorInfo available and I don't think it's worth the maintenance
+                // overhead of doing it, nor would it have significant value over this approach.
+                Exception e = Marshal.GetExceptionForHR((int)_value, new IntPtr(-1));
+                Assert.IsNotNull(e);
+                // ArgumentNullException doesn't have the right constructor parameters,
+                // (nor does Win32Exception...)
+                // but E_POINTER gets mapped to NullReferenceException,
+                // so I don't think it will ever matter.
+                Assert.IsFalse(e is ArgumentNullException);
+
+                // If we're not getting anything better than a COMException from Marshal,
+                // then at least check the facility and attempt to do better ourselves.
+                if (e.GetType() == typeof(COMException))
+                {
+                    switch (Facility)
+                    {
+                        case Facility.Win32:
+                            e = new Win32Exception(Code, message);
+                            break;
+                        default:
+                            e = new COMException(message, (int)_value);
+                            break;
+                    }
+                }
+                else
+                {
+                    ConstructorInfo cons = e.GetType().GetConstructor(new[] { typeof(string) });
+                    if (null != cons)
+                    {
+                        e = cons.Invoke(new object[] { message }) as Exception;
+                        Assert.IsNotNull(e);
+                    }
+                }
+                throw e;
+            }
+        }
+
+        /// <summary>
+        /// Convert the result of Win32 GetLastError() into a raised exception.
+        /// </summary>
+        public static void ThrowLastError()
+        {
+            ((HRESULT)Win32Error.GetLastError()).ThrowIfFailed();
+            // Only expecting to call this when we're expecting a failed GetLastError()
+            Assert.Fail();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
new file mode 100644
index 000000000..a41287487
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
@@ -0,0 +1,185 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Windows;
+    using System.Windows.Threading;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+
+    internal sealed class MessageWindow : DispatcherObject, IDisposable
+    {
+        // Alias this to a static so the wrapper doesn't get GC'd
+        private static readonly WndProc s_WndProc = new WndProc(_WndProc);
+        private static readonly Dictionary<IntPtr, MessageWindow> s_windowLookup = new Dictionary<IntPtr, MessageWindow>();
+
+        private WndProc _wndProcCallback;
+        private string _className;
+        private bool _isDisposed;
+
+        public IntPtr Handle { get; private set; }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public MessageWindow(CS classStyle, WS style, WS_EX exStyle, Rect location, string name, WndProc callback)
+        {
+            // A null callback means just use DefWindowProc.
+            _wndProcCallback = callback;
+            _className = "MessageWindowClass+" + Guid.NewGuid().ToString();
+
+            var wc = new WNDCLASSEX
+            {
+                cbSize = Marshal.SizeOf(typeof(WNDCLASSEX)),
+                style = classStyle,
+                lpfnWndProc = s_WndProc,
+                hInstance = NativeMethods.GetModuleHandle(null),
+                hbrBackground = NativeMethods.GetStockObject(StockObject.NULL_BRUSH),
+                lpszMenuName = "",
+                lpszClassName = _className,
+            };
+
+            NativeMethods.RegisterClassEx(ref wc);
+
+            GCHandle gcHandle = default(GCHandle);
+            try
+            {
+                gcHandle = GCHandle.Alloc(this);
+                IntPtr pinnedThisPtr = (IntPtr)gcHandle;
+
+                Handle = NativeMethods.CreateWindowEx(
+                    exStyle,
+                    _className,
+                    name,
+                    style,
+                    (int)location.X,
+                    (int)location.Y,
+                    (int)location.Width,
+                    (int)location.Height,
+                    IntPtr.Zero,
+                    IntPtr.Zero,
+                    IntPtr.Zero,
+                    pinnedThisPtr);
+            }
+            finally
+            {
+                gcHandle.Free();
+            }
+        }
+
+        ~MessageWindow()
+        {
+            _Dispose(false, false);
+        }
+
+        public void Dispose()
+        {
+            _Dispose(true, false);
+            GC.SuppressFinalize(this);
+        }
+
+        // This isn't right if the Dispatcher has already started shutting down.
+        // It will wind up leaking the class ATOM...
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
+        private void _Dispose(bool disposing, bool isHwndBeingDestroyed)
+        {
+            if (_isDisposed)
+            {
+                // Block against reentrancy.
+                return;
+            }
+
+            _isDisposed = true;
+
+            IntPtr hwnd = Handle;
+            string className = _className;
+
+            if (isHwndBeingDestroyed)
+            {
+                Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback)(arg => _DestroyWindow(IntPtr.Zero, className)));
+            }
+            else if (Handle != IntPtr.Zero)
+            {
+                if (CheckAccess())
+                {
+                    _DestroyWindow(hwnd, className);
+                }
+                else
+                {
+                    Dispatcher.BeginInvoke(DispatcherPriority.Normal, (DispatcherOperationCallback)(arg => _DestroyWindow(hwnd, className)));
+                }
+            }
+
+            s_windowLookup.Remove(hwnd);
+
+            _className = null;
+            Handle = IntPtr.Zero;
+        }
+
+        [SuppressMessage("Microsoft.Usage", "CA1816:CallGCSuppressFinalizeCorrectly")]
+        private static IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
+        {
+            IntPtr ret = IntPtr.Zero;
+            MessageWindow hwndWrapper = null;
+
+            if (msg == WM.CREATE)
+            {
+                var createStruct = (CREATESTRUCT)Marshal.PtrToStructure(lParam, typeof(CREATESTRUCT));
+                GCHandle gcHandle = GCHandle.FromIntPtr(createStruct.lpCreateParams);
+                hwndWrapper = (MessageWindow)gcHandle.Target;
+                s_windowLookup.Add(hwnd, hwndWrapper);
+            }
+            else
+            {
+                if (!s_windowLookup.TryGetValue(hwnd, out hwndWrapper))
+                {
+                    return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+                }
+            }
+            Assert.IsNotNull(hwndWrapper);
+
+            WndProc callback = hwndWrapper._wndProcCallback;
+            if (callback != null)
+            {
+                ret = callback(hwnd, msg, wParam, lParam);
+            }
+            else
+            {
+                ret = NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+            }
+
+            if (msg == WM.NCDESTROY)
+            {
+                hwndWrapper._Dispose(true, true);
+                GC.SuppressFinalize(hwndWrapper);
+            }
+
+            return ret;
+        }
+
+        private static object _DestroyWindow(IntPtr hwnd, string className)
+        {
+            Utility.SafeDestroyWindow(ref hwnd);
+            NativeMethods.UnregisterClass(className, NativeMethods.GetModuleHandle(null));
+            return null;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
new file mode 100644
index 000000000..c4452ba10
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
@@ -0,0 +1,3474 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.ComponentModel;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
+    using System.Runtime.ConstrainedExecution;
+    using System.Runtime.InteropServices;
+    using System.Runtime.InteropServices.ComTypes;
+    using System.Security.Permissions;
+    using System.Text;
+    using Microsoft.Win32.SafeHandles;
+
+    // Some COM interfaces and Win32 structures are already declared in the framework.
+    // Interesting ones to remember in System.Runtime.InteropServices.ComTypes are:
+    using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
+    using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile;
+    using IStream = System.Runtime.InteropServices.ComTypes.IStream;
+
+    #region Native Values
+
+    internal static class Win32Value
+    {
+        public const uint MAX_PATH = 260;
+        public const uint INFOTIPSIZE = 1024;
+        public const uint TRUE = 1;
+        public const uint FALSE = 0;
+        public const uint sizeof_WCHAR = 2;
+        public const uint sizeof_CHAR = 1;
+        public const uint sizeof_BOOL = 4;
+    }
+
+    /// <summary>
+    /// HIGHCONTRAST flags
+    /// </summary>
+    [Flags]
+    internal enum HCF
+    { 
+        HIGHCONTRASTON  = 0x00000001,
+        AVAILABLE       = 0x00000002,
+        HOTKEYACTIVE    = 0x00000004,
+        CONFIRMHOTKEY   = 0x00000008,
+        HOTKEYSOUND     = 0x00000010,
+        INDICATOR       = 0x00000020,
+        HOTKEYAVAILABLE = 0x00000040,
+    }
+
+    /// <summary>
+    /// BITMAPINFOHEADER Compression type.  BI_*.
+    /// </summary>
+    internal enum BI
+    {
+        RGB = 0,
+    }
+
+    /// <summary>
+    /// CombingRgn flags.  RGN_*
+    /// </summary>
+    internal enum RGN
+    { 
+        /// <summary>
+        /// Creates the intersection of the two combined regions.
+        /// </summary>
+        AND = 1,
+        /// <summary>
+        /// Creates the union of two combined regions.
+        /// </summary>
+        OR = 2,
+        /// <summary>
+        /// Creates the union of two combined regions except for any overlapping areas.
+        /// </summary>
+        XOR = 3,
+        /// <summary>
+        /// Combines the parts of hrgnSrc1 that are not part of hrgnSrc2.
+        /// </summary>
+        DIFF = 4,
+        /// <summary>
+        /// Creates a copy of the region identified by hrgnSrc1.
+        /// </summary>
+        COPY = 5,
+    }
+
+    internal enum CombineRgnResult
+    {
+        ERROR = 0,
+        NULLREGION = 1,
+        SIMPLEREGION = 2,
+        COMPLEXREGION = 3,
+    }
+
+    /// <summary>
+    /// For IWebBrowser2.  OLECMDEXECOPT_*
+    /// </summary>
+    internal enum OLECMDEXECOPT
+    {
+        DODEFAULT = 0,
+        PROMPTUSER = 1,
+        DONTPROMPTUSER = 2,
+        SHOWHELP = 3
+    }
+
+    /// <summary>
+    /// For IWebBrowser2.  OLECMDF_*
+    /// </summary>
+    internal enum OLECMDF
+    {
+        SUPPORTED = 1,
+        ENABLED = 2,
+        LATCHED = 4,
+        NINCHED = 8,
+        INVISIBLE = 16,
+        DEFHIDEONCTXTMENU = 32
+    }
+
+    /// <summary>
+    /// For IWebBrowser2.  OLECMDID_*
+    /// </summary>
+    internal enum OLECMDID
+    {
+        OPEN = 1,
+        NEW = 2,
+        SAVE = 3,
+        SAVEAS = 4,
+        SAVECOPYAS = 5,
+        PRINT = 6,
+        PRINTPREVIEW = 7,
+        PAGESETUP = 8,
+        SPELL = 9,
+        PROPERTIES = 10,
+        CUT = 11,
+        COPY = 12,
+        PASTE = 13,
+        PASTESPECIAL = 14,
+        UNDO = 15,
+        REDO = 16,
+        SELECTALL = 17,
+        CLEARSELECTION = 18,
+        ZOOM = 19,
+        GETZOOMRANGE = 20,
+        UPDATECOMMANDS = 21,
+        REFRESH = 22,
+        STOP = 23,
+        HIDETOOLBARS = 24,
+        SETPROGRESSMAX = 25,
+        SETPROGRESSPOS = 26,
+        SETPROGRESSTEXT = 27,
+        SETTITLE = 28,
+        SETDOWNLOADSTATE = 29,
+        STOPDOWNLOAD = 30,
+        ONTOOLBARACTIVATED = 31,
+        FIND = 32,
+        DELETE = 33,
+        HTTPEQUIV = 34,
+        HTTPEQUIV_DONE = 35,
+        ENABLE_INTERACTION = 36,
+        ONUNLOAD = 37,
+        PROPERTYBAG2 = 38,
+        PREREFRESH = 39,
+        SHOWSCRIPTERROR = 40,
+        SHOWMESSAGE = 41,
+        SHOWFIND = 42,
+        SHOWPAGESETUP = 43,
+        SHOWPRINT = 44,
+        CLOSE = 45,
+        ALLOWUILESSSAVEAS = 46,
+        DONTDOWNLOADCSS = 47,
+        UPDATEPAGESTATUS = 48,
+        PRINT2 = 49,
+        PRINTPREVIEW2 = 50,
+        SETPRINTTEMPLATE = 51,
+        GETPRINTTEMPLATE = 52,
+        PAGEACTIONBLOCKED = 55,
+        PAGEACTIONUIQUERY = 56,
+        FOCUSVIEWCONTROLS = 57,
+        FOCUSVIEWCONTROLSQUERY = 58,
+        SHOWPAGEACTIONMENU = 59
+    }
+
+    /// <summary>
+    /// For IWebBrowser2.  READYSTATE_*
+    /// </summary>
+    enum READYSTATE
+    {
+        UNINITIALIZED = 0,
+        LOADING = 1,
+        LOADED = 2,
+        INTERACTIVE = 3,
+        COMPLETE = 4
+    }
+
+    /// <summary>
+    /// DATAOBJ_GET_ITEM_FLAGS.  DOGIF_*.
+    /// </summary>
+    internal enum DOGIF
+    {
+        DEFAULT = 0x0000,
+        TRAVERSE_LINK = 0x0001,    // if the item is a link get the target
+        NO_HDROP = 0x0002,    // don't fallback and use CF_HDROP clipboard format
+        NO_URL = 0x0004,    // don't fallback and use URL clipboard format
+        ONLY_IF_ONE = 0x0008,    // only return the item if there is one item in the array
+    }
+
+    internal enum DWM_SIT
+    {
+        None,
+        DISPLAYFRAME = 1,
+    }
+
+    [Flags]
+    internal enum ErrorModes
+    {
+        /// <summary>Use the system default, which is to display all error dialog boxes.</summary>
+        Default = 0x0,
+        /// <summary>
+        /// The system does not display the critical-error-handler message box. 
+        /// Instead, the system sends the error to the calling process.
+        /// </summary>
+        FailCriticalErrors = 0x1,
+        /// <summary>
+        /// 64-bit Windows:  The system automatically fixes memory alignment faults and makes them 
+        /// invisible to the application. It does this for the calling process and any descendant processes.
+        /// After this value is set for a process, subsequent attempts to clear the value are ignored.
+        /// </summary>
+        NoGpFaultErrorBox = 0x2,
+        /// <summary>
+        /// The system does not display the general-protection-fault message box. 
+        /// This flag should only be set by debugging applications that handle general 
+        /// protection (GP) faults themselves with an exception handler.
+        /// </summary>
+        NoAlignmentFaultExcept = 0x4,
+        /// <summary>
+        /// The system does not display a message box when it fails to find a file. 
+        /// Instead, the error is returned to the calling process.
+        /// </summary>
+        NoOpenFileErrorBox = 0x8000
+    }
+
+    /// <summary>
+    /// Non-client hit test values, HT*
+    /// </summary>
+    internal enum HT
+    {
+        ERROR = -2,
+        TRANSPARENT = -1,
+        NOWHERE = 0,
+        CLIENT = 1,
+        CAPTION = 2,
+        SYSMENU = 3,
+        GROWBOX = 4,
+        SIZE = GROWBOX,
+        MENU = 5,
+        HSCROLL = 6,
+        VSCROLL = 7,
+        MINBUTTON = 8,
+        MAXBUTTON = 9,
+        LEFT = 10,
+        RIGHT = 11,
+        TOP = 12,
+        TOPLEFT = 13,
+        TOPRIGHT = 14,
+        BOTTOM = 15,
+        BOTTOMLEFT = 16,
+        BOTTOMRIGHT = 17,
+        BORDER = 18,
+        REDUCE = MINBUTTON,
+        ZOOM = MAXBUTTON,
+        SIZEFIRST = LEFT,
+        SIZELAST = BOTTOMRIGHT,
+        OBJECT = 19,
+        CLOSE = 20,
+        HELP = 21
+    }
+
+    /// <summary>
+    /// GetClassLongPtr values, GCLP_*
+    /// </summary>
+    internal enum GCLP
+    {
+        HBRBACKGROUND = -10,
+    }
+
+    /// <summary>
+    /// GetWindowLongPtr values, GWL_*
+    /// </summary>
+    internal enum GWL
+    {
+        WNDPROC = (-4),
+        HINSTANCE = (-6),
+        HWNDPARENT = (-8),
+        STYLE = (-16),
+        EXSTYLE = (-20),
+        USERDATA = (-21),
+        ID = (-12)
+    }
+
+    /// <summary>
+    /// SystemMetrics.  SM_*
+    /// </summary>
+    internal enum SM
+    {
+        CXSCREEN = 0,
+        CYSCREEN = 1,
+        CXVSCROLL = 2,
+        CYHSCROLL = 3,
+        CYCAPTION = 4,
+        CXBORDER = 5,
+        CYBORDER = 6,
+        CXFIXEDFRAME = 7,
+        CYFIXEDFRAME = 8,
+        CYVTHUMB = 9,
+        CXHTHUMB = 10,
+        CXICON = 11,
+        CYICON = 12,
+        CXCURSOR = 13,
+        CYCURSOR = 14,
+        CYMENU = 15,
+        CXFULLSCREEN = 16,
+        CYFULLSCREEN = 17,
+        CYKANJIWINDOW = 18,
+        MOUSEPRESENT = 19,
+        CYVSCROLL = 20,
+        CXHSCROLL = 21,
+        DEBUG = 22,
+        SWAPBUTTON = 23,
+        CXMIN = 28,
+        CYMIN = 29,
+        CXSIZE = 30,
+        CYSIZE = 31,
+        CXFRAME = 32,
+        CXSIZEFRAME = CXFRAME,
+        CYFRAME = 33,
+        CYSIZEFRAME = CYFRAME,
+        CXMINTRACK = 34,
+        CYMINTRACK = 35,
+        CXDOUBLECLK = 36,
+        CYDOUBLECLK = 37,
+        CXICONSPACING = 38,
+        CYICONSPACING = 39,
+        MENUDROPALIGNMENT = 40,
+        PENWINDOWS = 41,
+        DBCSENABLED = 42,
+        CMOUSEBUTTONS = 43,
+        SECURE = 44,
+        CXEDGE = 45,
+        CYEDGE = 46,
+        CXMINSPACING = 47,
+        CYMINSPACING = 48,
+        CXSMICON = 49,
+        CYSMICON = 50,
+        CYSMCAPTION = 51,
+        CXSMSIZE = 52,
+        CYSMSIZE = 53,
+        CXMENUSIZE = 54,
+        CYMENUSIZE = 55,
+        ARRANGE = 56,
+        CXMINIMIZED = 57,
+        CYMINIMIZED = 58,
+        CXMAXTRACK = 59,
+        CYMAXTRACK = 60,
+        CXMAXIMIZED = 61,
+        CYMAXIMIZED = 62,
+        NETWORK = 63,
+        CLEANBOOT = 67,
+        CXDRAG = 68,
+        CYDRAG = 69,
+        SHOWSOUNDS = 70,
+        CXMENUCHECK = 71,
+        CYMENUCHECK = 72,
+        SLOWMACHINE = 73,
+        MIDEASTENABLED = 74,
+        MOUSEWHEELPRESENT = 75,
+        XVIRTUALSCREEN = 76,
+        YVIRTUALSCREEN = 77,
+        CXVIRTUALSCREEN = 78,
+        CYVIRTUALSCREEN = 79,
+        CMONITORS = 80,
+        SAMEDISPLAYFORMAT = 81,
+        IMMENABLED = 82,
+        CXFOCUSBORDER = 83,
+        CYFOCUSBORDER = 84,
+        TABLETPC = 86,
+        MEDIACENTER = 87,
+        REMOTESESSION = 0x1000,
+        REMOTECONTROL = 0x2001,
+    }
+
+    /// <summary>
+    /// SystemParameterInfo values, SPI_*
+    /// </summary>
+    internal enum SPI
+    {
+        GETBEEP               = 0x0001,
+        SETBEEP               = 0x0002,
+        GETMOUSE              = 0x0003,
+        SETMOUSE              = 0x0004,
+        GETBORDER             = 0x0005,
+        SETBORDER             = 0x0006,
+        GETKEYBOARDSPEED      = 0x000A,
+        SETKEYBOARDSPEED      = 0x000B,
+        LANGDRIVER            = 0x000C,
+        ICONHORIZONTALSPACING = 0x000D,
+        GETSCREENSAVETIMEOUT  = 0x000E,
+        SETSCREENSAVETIMEOUT  = 0x000F,
+        GETSCREENSAVEACTIVE   = 0x0010,
+        SETSCREENSAVEACTIVE   = 0x0011,
+        GETGRIDGRANULARITY    = 0x0012,
+        SETGRIDGRANULARITY    = 0x0013,
+        SETDESKWALLPAPER      = 0x0014,
+        SETDESKPATTERN        = 0x0015,
+        GETKEYBOARDDELAY      = 0x0016,
+        SETKEYBOARDDELAY      = 0x0017,
+        ICONVERTICALSPACING   = 0x0018,
+        GETICONTITLEWRAP      = 0x0019,
+        SETICONTITLEWRAP      = 0x001A,
+        GETMENUDROPALIGNMENT  = 0x001B,
+        SETMENUDROPALIGNMENT  = 0x001C,
+        SETDOUBLECLKWIDTH     = 0x001D,
+        SETDOUBLECLKHEIGHT    = 0x001E,
+        GETICONTITLELOGFONT   = 0x001F,
+        SETDOUBLECLICKTIME    = 0x0020,
+        SETMOUSEBUTTONSWAP    = 0x0021,
+        SETICONTITLELOGFONT   = 0x0022,
+        GETFASTTASKSWITCH     = 0x0023,
+        SETFASTTASKSWITCH     = 0x0024,
+
+        SETDRAGFULLWINDOWS    = 0x0025,
+        GETDRAGFULLWINDOWS    = 0x0026,
+        GETNONCLIENTMETRICS   = 0x0029,
+        SETNONCLIENTMETRICS   = 0x002A,
+        GETMINIMIZEDMETRICS   = 0x002B,
+        SETMINIMIZEDMETRICS   = 0x002C,
+        GETICONMETRICS        = 0x002D,
+        SETICONMETRICS        = 0x002E,
+        SETWORKAREA           = 0x002F,
+        GETWORKAREA           = 0x0030,
+        SETPENWINDOWS         = 0x0031,
+        GETHIGHCONTRAST       = 0x0042,
+        SETHIGHCONTRAST       = 0x0043,
+        GETKEYBOARDPREF       = 0x0044,
+        SETKEYBOARDPREF       = 0x0045,
+        GETSCREENREADER       = 0x0046,
+        SETSCREENREADER       = 0x0047,
+        GETANIMATION          = 0x0048,
+        SETANIMATION          = 0x0049,
+        GETFONTSMOOTHING      = 0x004A,
+        SETFONTSMOOTHING      = 0x004B,
+        SETDRAGWIDTH          = 0x004C,
+        SETDRAGHEIGHT         = 0x004D,
+        SETHANDHELD           = 0x004E,
+        GETLOWPOWERTIMEOUT    = 0x004F,
+        GETPOWEROFFTIMEOUT    = 0x0050,
+        SETLOWPOWERTIMEOUT    = 0x0051,
+        SETPOWEROFFTIMEOUT    = 0x0052,
+        GETLOWPOWERACTIVE     = 0x0053,
+        GETPOWEROFFACTIVE     = 0x0054,
+        SETLOWPOWERACTIVE     = 0x0055,
+        SETPOWEROFFACTIVE     = 0x0056,
+        SETCURSORS            = 0x0057,
+        SETICONS              = 0x0058,
+        GETDEFAULTINPUTLANG   = 0x0059,
+        SETDEFAULTINPUTLANG   = 0x005A,
+        SETLANGTOGGLE         = 0x005B,
+        GETWINDOWSEXTENSION   = 0x005C,
+        SETMOUSETRAILS        = 0x005D,
+        GETMOUSETRAILS        = 0x005E,
+        SETSCREENSAVERRUNNING = 0x0061,
+        SCREENSAVERRUNNING    = SETSCREENSAVERRUNNING,
+        GETFILTERKEYS        = 0x0032,
+        SETFILTERKEYS        = 0x0033,
+        GETTOGGLEKEYS        = 0x0034,
+        SETTOGGLEKEYS        = 0x0035,
+        GETMOUSEKEYS         = 0x0036,
+        SETMOUSEKEYS         = 0x0037,
+        GETSHOWSOUNDS        = 0x0038,
+        SETSHOWSOUNDS        = 0x0039,
+        GETSTICKYKEYS        = 0x003A,
+        SETSTICKYKEYS        = 0x003B,
+        GETACCESSTIMEOUT     = 0x003C,
+        SETACCESSTIMEOUT     = 0x003D,
+
+        GETSERIALKEYS        = 0x003E,
+        SETSERIALKEYS        = 0x003F,
+        GETSOUNDSENTRY       = 0x0040,
+        SETSOUNDSENTRY       = 0x0041,
+        GETSNAPTODEFBUTTON   = 0x005F,
+        SETSNAPTODEFBUTTON   = 0x0060,
+        GETMOUSEHOVERWIDTH   = 0x0062,
+        SETMOUSEHOVERWIDTH   = 0x0063,
+        GETMOUSEHOVERHEIGHT  = 0x0064,
+        SETMOUSEHOVERHEIGHT  = 0x0065,
+        GETMOUSEHOVERTIME    = 0x0066,
+        SETMOUSEHOVERTIME    = 0x0067,
+        GETWHEELSCROLLLINES  = 0x0068,
+        SETWHEELSCROLLLINES  = 0x0069,
+        GETMENUSHOWDELAY     = 0x006A,
+        SETMENUSHOWDELAY     = 0x006B,
+
+        GETWHEELSCROLLCHARS = 0x006C,
+        SETWHEELSCROLLCHARS = 0x006D,
+
+        GETSHOWIMEUI        = 0x006E,
+        SETSHOWIMEUI        = 0x006F,
+
+        GETMOUSESPEED       = 0x0070,
+        SETMOUSESPEED       = 0x0071,
+        GETSCREENSAVERRUNNING = 0x0072,
+        GETDESKWALLPAPER    = 0x0073,
+
+        GETAUDIODESCRIPTION = 0x0074,
+        SETAUDIODESCRIPTION = 0x0075,
+
+        GETSCREENSAVESECURE = 0x0076,
+        SETSCREENSAVESECURE = 0x0077,
+
+        GETHUNGAPPTIMEOUT         = 0x0078,
+        SETHUNGAPPTIMEOUT         = 0x0079,
+        GETWAITTOKILLTIMEOUT      = 0x007A,
+        SETWAITTOKILLTIMEOUT      = 0x007B,
+        GETWAITTOKILLSERVICETIMEOUT = 0x007C,
+        SETWAITTOKILLSERVICETIMEOUT = 0x007D,
+        GETMOUSEDOCKTHRESHOLD     = 0x007E,
+        SETMOUSEDOCKTHRESHOLD     = 0x007F,
+        GETPENDOCKTHRESHOLD       = 0x0080,
+        SETPENDOCKTHRESHOLD       = 0x0081,
+        GETWINARRANGING           = 0x0082,
+        SETWINARRANGING           = 0x0083,
+        GETMOUSEDRAGOUTTHRESHOLD  = 0x0084,
+        SETMOUSEDRAGOUTTHRESHOLD  = 0x0085,
+        GETPENDRAGOUTTHRESHOLD    = 0x0086,
+        SETPENDRAGOUTTHRESHOLD    = 0x0087,
+        GETMOUSESIDEMOVETHRESHOLD = 0x0088,
+        SETMOUSESIDEMOVETHRESHOLD = 0x0089,
+        GETPENSIDEMOVETHRESHOLD   = 0x008A,
+        SETPENSIDEMOVETHRESHOLD   = 0x008B,
+        GETDRAGFROMMAXIMIZE       = 0x008C,
+        SETDRAGFROMMAXIMIZE       = 0x008D,
+        GETSNAPSIZING             = 0x008E,
+        SETSNAPSIZING             = 0x008F,
+        GETDOCKMOVING             = 0x0090,
+        SETDOCKMOVING             = 0x0091,
+
+        GETACTIVEWINDOWTRACKING       = 0x1000,
+        SETACTIVEWINDOWTRACKING       = 0x1001,
+        GETMENUANIMATION              = 0x1002,
+        SETMENUANIMATION              = 0x1003,
+        GETCOMBOBOXANIMATION          = 0x1004,
+        SETCOMBOBOXANIMATION          = 0x1005,
+        GETLISTBOXSMOOTHSCROLLING     = 0x1006,
+        SETLISTBOXSMOOTHSCROLLING     = 0x1007,
+        GETGRADIENTCAPTIONS           = 0x1008,
+        SETGRADIENTCAPTIONS           = 0x1009,
+        GETKEYBOARDCUES               = 0x100A,
+        SETKEYBOARDCUES               = 0x100B,
+        GETMENUUNDERLINES             = GETKEYBOARDCUES,
+        SETMENUUNDERLINES             = SETKEYBOARDCUES,
+        GETACTIVEWNDTRKZORDER         = 0x100C,
+        SETACTIVEWNDTRKZORDER         = 0x100D,
+        GETHOTTRACKING                = 0x100E,
+        SETHOTTRACKING                = 0x100F,
+        GETMENUFADE                   = 0x1012,
+        SETMENUFADE                   = 0x1013,
+        GETSELECTIONFADE              = 0x1014,
+        SETSELECTIONFADE              = 0x1015,
+        GETTOOLTIPANIMATION           = 0x1016,
+        SETTOOLTIPANIMATION           = 0x1017,
+        GETTOOLTIPFADE                = 0x1018,
+        SETTOOLTIPFADE                = 0x1019,
+        GETCURSORSHADOW               = 0x101A,
+        SETCURSORSHADOW               = 0x101B,
+        GETMOUSESONAR                 = 0x101C,
+        SETMOUSESONAR                 = 0x101D,
+        GETMOUSECLICKLOCK             = 0x101E,
+        SETMOUSECLICKLOCK             = 0x101F,
+        GETMOUSEVANISH                = 0x1020,
+        SETMOUSEVANISH                = 0x1021,
+        GETFLATMENU                   = 0x1022,
+        SETFLATMENU                   = 0x1023,
+        GETDROPSHADOW                 = 0x1024,
+        SETDROPSHADOW                 = 0x1025,
+        GETBLOCKSENDINPUTRESETS       = 0x1026,
+        SETBLOCKSENDINPUTRESETS       = 0x1027,
+
+        GETUIEFFECTS                  = 0x103E,
+        SETUIEFFECTS                  = 0x103F,
+
+        GETDISABLEOVERLAPPEDCONTENT   = 0x1040,
+        SETDISABLEOVERLAPPEDCONTENT   = 0x1041,
+        GETCLIENTAREAANIMATION        = 0x1042,
+        SETCLIENTAREAANIMATION        = 0x1043,
+        GETCLEARTYPE                  = 0x1048,
+        SETCLEARTYPE                  = 0x1049,
+        GETSPEECHRECOGNITION          = 0x104A,
+        SETSPEECHRECOGNITION          = 0x104B,
+
+        GETFOREGROUNDLOCKTIMEOUT      = 0x2000,
+        SETFOREGROUNDLOCKTIMEOUT      = 0x2001,
+        GETACTIVEWNDTRKTIMEOUT        = 0x2002,
+        SETACTIVEWNDTRKTIMEOUT        = 0x2003,
+        GETFOREGROUNDFLASHCOUNT       = 0x2004,
+        SETFOREGROUNDFLASHCOUNT       = 0x2005,
+        GETCARETWIDTH                 = 0x2006,
+        SETCARETWIDTH                 = 0x2007,
+
+        GETMOUSECLICKLOCKTIME         = 0x2008,
+        SETMOUSECLICKLOCKTIME         = 0x2009,
+        GETFONTSMOOTHINGTYPE          = 0x200A,
+        SETFONTSMOOTHINGTYPE          = 0x200B,
+
+        GETFONTSMOOTHINGCONTRAST         = 0x200C,
+        SETFONTSMOOTHINGCONTRAST         = 0x200D,
+
+        GETFOCUSBORDERWIDTH           = 0x200E,
+        SETFOCUSBORDERWIDTH           = 0x200F,
+        GETFOCUSBORDERHEIGHT          = 0x2010,
+        SETFOCUSBORDERHEIGHT          = 0x2011,
+
+        GETFONTSMOOTHINGORIENTATION         = 0x2012,
+        SETFONTSMOOTHINGORIENTATION         = 0x2013,
+
+        GETMINIMUMHITRADIUS           = 0x2014,
+        SETMINIMUMHITRADIUS           = 0x2015,
+        GETMESSAGEDURATION            = 0x2016,
+        SETMESSAGEDURATION            = 0x2017,
+    }
+
+    /// <summary>
+    /// SystemParameterInfo flag values, SPIF_*
+    /// </summary>
+    [Flags]
+    internal enum SPIF
+    {
+        None = 0,
+        UPDATEINIFILE = 0x01,
+        SENDCHANGE = 0x02,
+        SENDWININICHANGE = SENDCHANGE,
+    }
+
+    [Flags]
+    internal enum STATE_SYSTEM
+    {
+        UNAVAILABLE      = 0x00000001, // Disabled
+        SELECTED         = 0x00000002,
+        FOCUSED          = 0x00000004,
+        PRESSED          = 0x00000008,
+        CHECKED          = 0x00000010,
+        MIXED            = 0x00000020,  // 3-state checkbox or toolbar button
+        INDETERMINATE    = MIXED,
+        READONLY         = 0x00000040,
+        HOTTRACKED       = 0x00000080,
+        DEFAULT          = 0x00000100,
+        EXPANDED         = 0x00000200,
+        COLLAPSED        = 0x00000400,
+        BUSY             = 0x00000800,
+        FLOATING         = 0x00001000,  // Children "owned" not "contained" by parent
+        MARQUEED         = 0x00002000,
+        ANIMATED         = 0x00004000,
+        INVISIBLE        = 0x00008000,
+        OFFSCREEN        = 0x00010000,
+        SIZEABLE         = 0x00020000,
+        MOVEABLE         = 0x00040000,
+        SELFVOICING      = 0x00080000,
+        FOCUSABLE        = 0x00100000,
+        SELECTABLE       = 0x00200000,
+        LINKED           = 0x00400000,
+        TRAVERSED        = 0x00800000,
+        MULTISELECTABLE  = 0x01000000,  // Supports multiple selection
+        EXTSELECTABLE    = 0x02000000,  // Supports extended selection
+        ALERT_LOW        = 0x04000000,  // This information is of low priority
+        ALERT_MEDIUM     = 0x08000000,  // This information is of medium priority
+        ALERT_HIGH       = 0x10000000,  // This information is of high priority
+        PROTECTED        = 0x20000000,  // access to this is restricted
+        VALID            = 0x3FFFFFFF,
+    }
+
+    internal enum StockObject : int
+    {
+        WHITE_BRUSH = 0,
+        LTGRAY_BRUSH = 1,
+        GRAY_BRUSH = 2,
+        DKGRAY_BRUSH = 3,
+        BLACK_BRUSH = 4,
+        NULL_BRUSH = 5,
+        HOLLOW_BRUSH = NULL_BRUSH,
+        WHITE_PEN = 6,
+        BLACK_PEN = 7,
+        NULL_PEN = 8,
+        SYSTEM_FONT = 13,
+        DEFAULT_PALETTE = 15,
+    }
+
+    /// <summary>
+    /// CS_*
+    /// </summary>
+    [Flags]
+    internal enum CS : uint
+    {
+        VREDRAW = 0x0001,
+        HREDRAW = 0x0002,
+        DBLCLKS = 0x0008,
+        OWNDC = 0x0020,
+        CLASSDC = 0x0040,
+        PARENTDC = 0x0080,
+        NOCLOSE = 0x0200,
+        SAVEBITS = 0x0800,
+        BYTEALIGNCLIENT = 0x1000,
+        BYTEALIGNWINDOW = 0x2000,
+        GLOBALCLASS = 0x4000,
+        IME = 0x00010000,
+        DROPSHADOW = 0x00020000
+    }
+
+    /// <summary>
+    /// WindowStyle values, WS_*
+    /// </summary>
+    [Flags]
+    internal enum WS : uint
+    {
+        OVERLAPPED = 0x00000000,
+        POPUP = 0x80000000,
+        CHILD = 0x40000000,
+        MINIMIZE = 0x20000000,
+        VISIBLE = 0x10000000,
+        DISABLED = 0x08000000,
+        CLIPSIBLINGS = 0x04000000,
+        CLIPCHILDREN = 0x02000000,
+        MAXIMIZE = 0x01000000,
+        BORDER = 0x00800000,
+        DLGFRAME = 0x00400000,
+        VSCROLL = 0x00200000,
+        HSCROLL = 0x00100000,
+        SYSMENU = 0x00080000,
+        THICKFRAME = 0x00040000,
+        GROUP = 0x00020000,
+        TABSTOP = 0x00010000,
+
+        MINIMIZEBOX = 0x00020000,
+        MAXIMIZEBOX = 0x00010000,
+
+        CAPTION = BORDER | DLGFRAME,
+        TILED = OVERLAPPED,
+        ICONIC = MINIMIZE,
+        SIZEBOX = THICKFRAME,
+        TILEDWINDOW = OVERLAPPEDWINDOW,
+
+        OVERLAPPEDWINDOW = OVERLAPPED | CAPTION | SYSMENU | THICKFRAME | MINIMIZEBOX | MAXIMIZEBOX,
+        POPUPWINDOW = POPUP | BORDER | SYSMENU,
+        CHILDWINDOW = CHILD,
+    }
+
+    /// <summary>
+    /// Window message values, WM_*
+    /// </summary>
+    internal enum WM
+    {
+        NULL = 0x0000,
+        CREATE = 0x0001,
+        DESTROY = 0x0002,
+        MOVE = 0x0003,
+        SIZE = 0x0005,
+        ACTIVATE = 0x0006,
+        SETFOCUS = 0x0007,
+        KILLFOCUS = 0x0008,
+        ENABLE = 0x000A,
+        SETREDRAW = 0x000B,
+        SETTEXT = 0x000C,
+        GETTEXT = 0x000D,
+        GETTEXTLENGTH = 0x000E,
+        PAINT = 0x000F,
+        CLOSE = 0x0010,
+        QUERYENDSESSION = 0x0011,
+        QUIT = 0x0012,
+        QUERYOPEN = 0x0013,
+        ERASEBKGND = 0x0014,
+        SYSCOLORCHANGE = 0x0015,
+        SHOWWINDOW = 0x0018,
+        CTLCOLOR = 0x0019,
+        WININICHANGE = 0x001A,
+        SETTINGCHANGE = 0x001A,
+        ACTIVATEAPP = 0x001C,
+        SETCURSOR = 0x0020,
+        MOUSEACTIVATE = 0x0021,
+        CHILDACTIVATE = 0x0022,
+        QUEUESYNC = 0x0023,
+        GETMINMAXINFO = 0x0024,
+
+        WINDOWPOSCHANGING = 0x0046,
+        WINDOWPOSCHANGED = 0x0047,
+
+        CONTEXTMENU = 0x007B,
+        STYLECHANGING = 0x007C,
+        STYLECHANGED = 0x007D,
+        DISPLAYCHANGE = 0x007E,
+        GETICON = 0x007F,
+        SETICON = 0x0080,
+        NCCREATE = 0x0081,
+        NCDESTROY = 0x0082,
+        NCCALCSIZE = 0x0083,
+        NCHITTEST = 0x0084,
+        NCPAINT = 0x0085,
+        NCACTIVATE = 0x0086,
+        GETDLGCODE = 0x0087,
+        SYNCPAINT = 0x0088,
+        NCMOUSEMOVE = 0x00A0,
+        NCLBUTTONDOWN = 0x00A1,
+        NCLBUTTONUP = 0x00A2,
+        NCLBUTTONDBLCLK = 0x00A3,
+        NCRBUTTONDOWN = 0x00A4,
+        NCRBUTTONUP = 0x00A5,
+        NCRBUTTONDBLCLK = 0x00A6,
+        NCMBUTTONDOWN = 0x00A7,
+        NCMBUTTONUP = 0x00A8,
+        NCMBUTTONDBLCLK = 0x00A9,
+
+        SYSKEYDOWN = 0x0104,
+        SYSKEYUP = 0x0105,
+        SYSCHAR = 0x0106,
+        SYSDEADCHAR = 0x0107,
+        COMMAND = 0x0111,
+        SYSCOMMAND = 0x0112,
+
+        MOUSEMOVE = 0x0200,
+        LBUTTONDOWN = 0x0201,
+        LBUTTONUP = 0x0202,
+        LBUTTONDBLCLK = 0x0203,
+        RBUTTONDOWN = 0x0204,
+        RBUTTONUP = 0x0205,
+        RBUTTONDBLCLK = 0x0206,
+        MBUTTONDOWN = 0x0207,
+        MBUTTONUP = 0x0208,
+        MBUTTONDBLCLK = 0x0209,
+        MOUSEWHEEL = 0x020A,
+        XBUTTONDOWN = 0x020B,
+        XBUTTONUP = 0x020C,
+        XBUTTONDBLCLK = 0x020D,
+        MOUSEHWHEEL = 0x020E,
+        PARENTNOTIFY = 0x0210,
+
+        CAPTURECHANGED = 0x0215,
+        POWERBROADCAST = 0x0218,
+        DEVICECHANGE = 0x0219,
+
+        ENTERSIZEMOVE = 0x0231,
+        EXITSIZEMOVE = 0x0232,
+
+        IME_SETCONTEXT = 0x0281,
+        IME_NOTIFY = 0x0282,
+        IME_CONTROL = 0x0283,
+        IME_COMPOSITIONFULL = 0x0284,
+        IME_SELECT = 0x0285,
+        IME_CHAR = 0x0286,
+        IME_REQUEST = 0x0288,
+        IME_KEYDOWN = 0x0290,
+        IME_KEYUP = 0x0291,
+
+        NCMOUSELEAVE = 0x02A2,
+
+        TABLET_DEFBASE = 0x02C0,
+        //WM_TABLET_MAXOFFSET = 0x20,
+
+        TABLET_ADDED = TABLET_DEFBASE + 8,
+        TABLET_DELETED = TABLET_DEFBASE + 9,
+        TABLET_FLICK = TABLET_DEFBASE + 11,
+        TABLET_QUERYSYSTEMGESTURESTATUS = TABLET_DEFBASE + 12,
+
+        CUT = 0x0300,
+        COPY = 0x0301,
+        PASTE = 0x0302,
+        CLEAR = 0x0303,
+        UNDO = 0x0304,
+        RENDERFORMAT = 0x0305,
+        RENDERALLFORMATS = 0x0306,
+        DESTROYCLIPBOARD = 0x0307,
+        DRAWCLIPBOARD = 0x0308,
+        PAINTCLIPBOARD = 0x0309,
+        VSCROLLCLIPBOARD = 0x030A,
+        SIZECLIPBOARD = 0x030B,
+        ASKCBFORMATNAME = 0x030C,
+        CHANGECBCHAIN = 0x030D,
+        HSCROLLCLIPBOARD = 0x030E,
+        QUERYNEWPALETTE = 0x030F,
+        PALETTEISCHANGING = 0x0310,
+        PALETTECHANGED = 0x0311,
+        HOTKEY = 0x0312,
+        PRINT = 0x0317,
+        PRINTCLIENT = 0x0318,
+        APPCOMMAND = 0x0319,
+        THEMECHANGED = 0x031A,
+
+        DWMCOMPOSITIONCHANGED = 0x031E,
+        DWMNCRENDERINGCHANGED = 0x031F,
+        DWMCOLORIZATIONCOLORCHANGED = 0x0320,
+        DWMWINDOWMAXIMIZEDCHANGE = 0x0321,
+
+        GETTITLEBARINFOEX = 0x033F,
+        #region Windows 7
+        DWMSENDICONICTHUMBNAIL = 0x0323,
+        DWMSENDICONICLIVEPREVIEWBITMAP = 0x0326,
+        #endregion
+
+        USER = 0x0400,
+
+        // This is the hard-coded message value used by WinForms for Shell_NotifyIcon.
+        // It's relatively safe to reuse.
+        TRAYMOUSEMESSAGE = 0x800, //WM_USER + 1024
+        APP = 0x8000,
+    }
+
+    /// <summary>
+    /// Window style extended values, WS_EX_*
+    /// </summary>
+    [Flags]
+    internal enum WS_EX : uint
+    {
+        None = 0,
+        DLGMODALFRAME = 0x00000001,
+        NOPARENTNOTIFY = 0x00000004,
+        TOPMOST = 0x00000008,
+        ACCEPTFILES = 0x00000010,
+        TRANSPARENT = 0x00000020,
+        MDICHILD = 0x00000040,
+        TOOLWINDOW = 0x00000080,
+        WINDOWEDGE = 0x00000100,
+        CLIENTEDGE = 0x00000200,
+        CONTEXTHELP = 0x00000400,
+        RIGHT = 0x00001000,
+        LEFT = 0x00000000,
+        RTLREADING = 0x00002000,
+        LTRREADING = 0x00000000,
+        LEFTSCROLLBAR = 0x00004000,
+        RIGHTSCROLLBAR = 0x00000000,
+        CONTROLPARENT = 0x00010000,
+        STATICEDGE = 0x00020000,
+        APPWINDOW = 0x00040000,
+        LAYERED = 0x00080000,
+        NOINHERITLAYOUT = 0x00100000, // Disable inheritence of mirroring by children
+        LAYOUTRTL = 0x00400000, // Right to left mirroring
+        COMPOSITED = 0x02000000,
+        NOACTIVATE = 0x08000000,
+        OVERLAPPEDWINDOW = (WINDOWEDGE | CLIENTEDGE),
+        PALETTEWINDOW = (WINDOWEDGE | TOOLWINDOW | TOPMOST),
+    }
+
+    /// <summary>
+    /// GetDeviceCaps nIndex values.
+    /// </summary>
+    internal enum DeviceCap
+    {
+        /// <summary>Number of bits per pixel
+        /// </summary>
+        BITSPIXEL = 12,
+        /// <summary>
+        /// Number of planes
+        /// </summary>
+        PLANES = 14,
+        /// <summary>
+        /// Logical pixels inch in X
+        /// </summary>
+        LOGPIXELSX = 88,
+        /// <summary>
+        /// Logical pixels inch in Y
+        /// </summary>
+        LOGPIXELSY = 90,
+    }
+
+    internal enum FO : int
+    {
+        MOVE = 0x0001,
+        COPY = 0x0002,
+        DELETE = 0x0003,
+        RENAME = 0x0004,
+    }
+
+    /// <summary>
+    /// "FILEOP_FLAGS", FOF_*.
+    /// </summary>
+    internal enum FOF : ushort
+    {
+        MULTIDESTFILES = 0x0001,
+        CONFIRMMOUSE = 0x0002,
+        SILENT = 0x0004,
+        RENAMEONCOLLISION = 0x0008,
+        NOCONFIRMATION = 0x0010,
+        WANTMAPPINGHANDLE = 0x0020,
+        ALLOWUNDO = 0x0040,
+        FILESONLY = 0x0080,
+        SIMPLEPROGRESS = 0x0100,
+        NOCONFIRMMKDIR = 0x0200,
+        NOERRORUI = 0x0400,
+        NOCOPYSECURITYATTRIBS = 0x0800,
+        NORECURSION = 0x1000,
+        NO_CONNECTED_ELEMENTS = 0x2000,
+        WANTNUKEWARNING = 0x4000,
+        NORECURSEREPARSE = 0x8000,
+    }
+
+    /// <summary>
+    /// EnableMenuItem uEnable values, MF_*
+    /// </summary>
+    [Flags]
+    internal enum MF : uint
+    {
+        /// <summary>
+        /// Possible return value for EnableMenuItem
+        /// </summary>
+        DOES_NOT_EXIST = unchecked((uint)-1),
+        ENABLED = 0,
+        BYCOMMAND = 0,
+        GRAYED = 1,
+        DISABLED = 2,
+    }
+
+    /// <summary>Specifies the type of visual style attribute to set on a window.</summary>
+    internal enum WINDOWTHEMEATTRIBUTETYPE : uint
+    {
+        /// <summary>Non-client area window attributes will be set.</summary>
+        WTA_NONCLIENT = 1,
+    }
+
+    /// <summary>
+    /// DWMFLIP3DWINDOWPOLICY.  DWMFLIP3D_*
+    /// </summary>
+    internal enum DWMFLIP3D
+    {
+        DEFAULT,
+        EXCLUDEBELOW,
+        EXCLUDEABOVE,
+        //LAST
+    }
+
+    /// <summary>
+    /// DWMNCRENDERINGPOLICY. DWMNCRP_*
+    /// </summary>
+    internal enum DWMNCRP
+    {
+        USEWINDOWSTYLE,
+        DISABLED,
+        ENABLED,
+        //LAST
+    }
+
+    /// <summary>
+    /// DWMWINDOWATTRIBUTE.  DWMWA_*
+    /// </summary>
+    internal enum DWMWA
+    {
+        NCRENDERING_ENABLED = 1,
+        NCRENDERING_POLICY,
+        TRANSITIONS_FORCEDISABLED,
+        ALLOW_NCPAINT,
+        CAPTION_BUTTON_BOUNDS,
+        NONCLIENT_RTL_LAYOUT,
+        FORCE_ICONIC_REPRESENTATION,
+        FLIP3D_POLICY,
+        EXTENDED_FRAME_BOUNDS,
+
+        // New to Windows 7:
+
+        HAS_ICONIC_BITMAP,
+        DISALLOW_PEEK,
+        EXCLUDED_FROM_PEEK,
+
+        // LAST
+    }
+
+    /// <summary>
+    /// WindowThemeNonClientAttributes
+    /// </summary>
+    [Flags]
+    internal enum WTNCA : uint
+    {
+        /// <summary>Prevents the window caption from being drawn.</summary>
+        NODRAWCAPTION = 0x00000001,
+        /// <summary>Prevents the system icon from being drawn.</summary>
+        NODRAWICON = 0x00000002,
+        /// <summary>Prevents the system icon menu from appearing.</summary>
+        NOSYSMENU = 0x00000004,
+        /// <summary>Prevents mirroring of the question mark, even in right-to-left (RTL) layout.</summary>
+        NOMIRRORHELP = 0x00000008,
+        /// <summary> A mask that contains all the valid bits.</summary>
+        VALIDBITS = NODRAWCAPTION | NODRAWICON | NOMIRRORHELP | NOSYSMENU,
+    }
+
+    /// <summary>
+    /// SetWindowPos options
+    /// </summary>
+    [Flags]
+    internal enum SWP
+    {
+        ASYNCWINDOWPOS = 0x4000,
+        DEFERERASE = 0x2000,
+        DRAWFRAME = 0x0020,
+        FRAMECHANGED = 0x0020,
+        HIDEWINDOW = 0x0080,
+        NOACTIVATE = 0x0010,
+        NOCOPYBITS = 0x0100,
+        NOMOVE = 0x0002,
+        NOOWNERZORDER = 0x0200,
+        NOREDRAW = 0x0008,
+        NOREPOSITION = 0x0200,
+        NOSENDCHANGING = 0x0400,
+        NOSIZE = 0x0001,
+        NOZORDER = 0x0004,
+        SHOWWINDOW = 0x0040,
+    }
+
+    /// <summary>
+    /// ShowWindow options
+    /// </summary>
+    internal enum SW
+    {
+        HIDE = 0,
+        SHOWNORMAL = 1,
+        NORMAL = 1,
+        SHOWMINIMIZED = 2,
+        SHOWMAXIMIZED = 3,
+        MAXIMIZE = 3,
+        SHOWNOACTIVATE = 4,
+        SHOW = 5,
+        MINIMIZE = 6,
+        SHOWMINNOACTIVE = 7,
+        SHOWNA = 8,
+        RESTORE = 9,
+        SHOWDEFAULT = 10,
+        FORCEMINIMIZE = 11,
+    }
+
+    internal enum SC
+    {
+        SIZE = 0xF000,
+        MOVE = 0xF010,
+        MINIMIZE = 0xF020,
+        MAXIMIZE = 0xF030,
+        NEXTWINDOW = 0xF040,
+        PREVWINDOW = 0xF050,
+        CLOSE = 0xF060,
+        VSCROLL = 0xF070,
+        HSCROLL = 0xF080,
+        MOUSEMENU = 0xF090,
+        KEYMENU = 0xF100,
+        ARRANGE = 0xF110,
+        RESTORE = 0xF120,
+        TASKLIST = 0xF130,
+        SCREENSAVE = 0xF140,
+        HOTKEY = 0xF150,
+        DEFAULT = 0xF160,
+        MONITORPOWER = 0xF170,
+        CONTEXTHELP = 0xF180,
+        SEPARATOR = 0xF00F,
+        /// <summary>
+        /// SCF_ISSECURE
+        /// </summary>
+        F_ISSECURE = 0x00000001,
+        ICON = MINIMIZE,
+        ZOOM = MAXIMIZE,
+    }
+
+    /// <summary>
+    /// GDI+ Status codes
+    /// </summary>
+    internal enum Status
+    {
+        Ok = 0,
+        GenericError = 1,
+        InvalidParameter = 2,
+        OutOfMemory = 3,
+        ObjectBusy = 4,
+        InsufficientBuffer = 5,
+        NotImplemented = 6,
+        Win32Error = 7,
+        WrongState = 8,
+        Aborted = 9,
+        FileNotFound = 10,
+        ValueOverflow = 11,
+        AccessDenied = 12,
+        UnknownImageFormat = 13,
+        FontFamilyNotFound = 14,
+        FontStyleNotFound = 15,
+        NotTrueTypeFont = 16,
+        UnsupportedGdiplusVersion = 17,
+        GdiplusNotInitialized = 18,
+        PropertyNotFound = 19,
+        PropertyNotSupported = 20,
+        ProfileNotFound = 21,
+    }
+
+    internal enum MOUSEEVENTF : int
+    {
+        //mouse event constants
+        LEFTDOWN = 2,
+        LEFTUP = 4
+    }
+
+    /// <summary>
+    /// MSGFLT_*.  New in Vista.  Realiased in Windows 7.
+    /// </summary>
+    internal enum MSGFLT
+    {
+        // Win7 versions of this enum:
+        RESET = 0,
+        ALLOW = 1,
+        DISALLOW = 2,
+
+        // Vista versions of this enum:
+        // ADD = 1,
+        // REMOVE = 2,
+    }
+
+    internal enum MSGFLTINFO
+    {
+        NONE = 0,
+        ALREADYALLOWED_FORWND = 1,
+        ALREADYDISALLOWED_FORWND = 2,
+        ALLOWED_HIGHER = 3,
+    }
+
+    internal enum INPUT_TYPE : uint
+    {
+        MOUSE = 0,
+    }
+
+    /// <summary>
+    /// Shell_NotifyIcon messages.  NIM_*
+    /// </summary>
+    internal enum NIM : uint
+    {
+        ADD = 0,
+        MODIFY = 1,
+        DELETE = 2,
+        SETFOCUS = 3,
+        SETVERSION = 4,
+    }
+
+    /// <summary>
+    /// SHAddToRecentDocuments flags.  SHARD_*
+    /// </summary>
+    internal enum SHARD
+    {
+        PIDL = 0x00000001,
+        PATHA = 0x00000002,
+        PATHW = 0x00000003,
+        APPIDINFO = 0x00000004, // indicates the data type is a pointer to a SHARDAPPIDINFO structure
+        APPIDINFOIDLIST = 0x00000005, // indicates the data type is a pointer to a SHARDAPPIDINFOIDLIST structure
+        LINK = 0x00000006, // indicates the data type is a pointer to an IShellLink instance
+        APPIDINFOLINK = 0x00000007, // indicates the data type is a pointer to a SHARDAPPIDINFOLINK structure 
+    }
+
+    [Flags]
+    enum SLGP
+    {
+        SHORTPATH = 0x1,
+        UNCPRIORITY = 0x2,
+        RAWPATH = 0x4
+    }
+
+    /// <summary>
+    /// Shell_NotifyIcon flags.  NIF_*
+    /// </summary>
+    [Flags]
+    internal enum NIF : uint
+    {
+        MESSAGE = 0x0001,
+        ICON = 0x0002,
+        TIP = 0x0004,
+        STATE = 0x0008,
+        INFO = 0x0010,
+        GUID = 0x0020,
+
+        /// <summary>
+        /// Vista only.
+        /// </summary>
+        REALTIME = 0x0040,
+        /// <summary>
+        /// Vista only.
+        /// </summary>
+        SHOWTIP = 0x0080,
+
+        XP_MASK = MESSAGE | ICON | STATE | INFO | GUID,
+        VISTA_MASK = XP_MASK | REALTIME | SHOWTIP,
+    }
+
+    /// <summary>
+    /// Shell_NotifyIcon info flags.  NIIF_*
+    /// </summary>
+    internal enum NIIF
+    {
+        NONE = 0x00000000,
+        INFO = 0x00000001,
+        WARNING = 0x00000002,
+        ERROR = 0x00000003,
+        /// <summary>XP SP2 and later.</summary>
+        USER = 0x00000004,
+        /// <summary>XP and later.</summary>
+        NOSOUND = 0x00000010,
+        /// <summary>Vista and later.</summary>
+        LARGE_ICON = 0x00000020,
+        /// <summary>Windows 7 and later</summary>
+        NIIF_RESPECT_QUIET_TIME = 0x00000080,
+        /// <summary>XP and later.  Native version called NIIF_ICON_MASK.</summary>
+        XP_ICON_MASK = 0x0000000F,
+    }
+
+    /// <summary>
+    /// AC_*
+    /// </summary>
+    internal enum AC : byte
+    {
+        SRC_OVER = 0,
+        SRC_ALPHA = 1,
+    }
+
+    internal enum ULW
+    {
+        ALPHA = 2,
+        COLORKEY = 1,
+        OPAQUE = 4,
+    }
+
+    internal enum WVR
+    {
+        ALIGNTOP = 0x0010,
+        ALIGNLEFT = 0x0020,
+        ALIGNBOTTOM = 0x0040,
+        ALIGNRIGHT = 0x0080,
+        HREDRAW = 0x0100,
+        VREDRAW = 0x0200,
+        VALIDRECTS = 0x0400,
+        REDRAW = HREDRAW | VREDRAW,
+    }
+
+    #endregion
+
+    #region SafeHandles
+
+    internal sealed class SafeFindHandle : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        [SecurityPermission(SecurityAction.LinkDemand, UnmanagedCode = true)]
+        private SafeFindHandle() : base(true) { }
+
+        protected override bool ReleaseHandle()
+        {
+            return NativeMethods.FindClose(handle);
+        }
+    }
+
+    internal sealed class SafeDC : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        private static class NativeMethods
+        {
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            [DllImport("user32.dll")]
+            public static extern int ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            [DllImport("user32.dll")]
+            public static extern SafeDC GetDC(IntPtr hwnd);
+
+            // Weird legacy function, documentation is unclear about how to use it...
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            [DllImport("gdi32.dll", CharSet = CharSet.Unicode)]
+            public static extern SafeDC CreateDC([MarshalAs(UnmanagedType.LPWStr)] string lpszDriver, [MarshalAs(UnmanagedType.LPWStr)] string lpszDevice, IntPtr lpszOutput, IntPtr lpInitData);
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            [DllImport("gdi32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+            public static extern SafeDC CreateCompatibleDC(IntPtr hdc);
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            [DllImport("gdi32.dll")]
+            [return: MarshalAs(UnmanagedType.Bool)]
+            public static extern bool DeleteDC(IntPtr hdc);
+        }
+
+        private IntPtr? _hwnd;
+        private bool _created;
+
+        public IntPtr Hwnd
+        {
+            set
+            {
+                Assert.NullableIsNull(_hwnd);
+                _hwnd = value;
+            }
+        }
+
+        private SafeDC() : base(true) { }
+
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        protected override bool ReleaseHandle()
+        {
+            if (_created)
+            {
+                return NativeMethods.DeleteDC(handle);
+            }
+
+            if (!_hwnd.HasValue || _hwnd.Value == IntPtr.Zero)
+            {
+                return true;
+            }
+
+            return NativeMethods.ReleaseDC(_hwnd.Value, handle) == 1;
+        }
+
+        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes"), SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static SafeDC CreateDC(string deviceName)
+        {
+            SafeDC dc = null;
+            try
+            {
+                // Should this really be on the driver parameter?
+                dc = NativeMethods.CreateDC(deviceName, null, IntPtr.Zero, IntPtr.Zero);
+            }
+            finally
+            {
+                if (dc != null)
+                {
+                    dc._created = true;
+                }
+            }
+
+            if (dc.IsInvalid)
+            {
+                dc.Dispose();
+                throw new SystemException("Unable to create a device context from the specified device information.");
+            }
+
+            return dc;
+        }
+
+        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes"), SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static SafeDC CreateCompatibleDC(SafeDC hdc)
+        {
+            SafeDC dc = null;
+            try
+            {
+                IntPtr hPtr = IntPtr.Zero;
+                if (hdc != null)
+                {
+                    hPtr = hdc.handle;
+                }
+                dc = NativeMethods.CreateCompatibleDC(hPtr);
+                if (dc == null)
+                {
+                    HRESULT.ThrowLastError();
+                }
+            }
+            finally
+            {
+                if (dc != null)
+                {
+                    dc._created = true;
+                }
+            }
+
+            if (dc.IsInvalid)
+            {
+                dc.Dispose();
+                throw new SystemException("Unable to create a device context from the specified device information.");
+            }
+
+            return dc;
+        }
+
+        public static SafeDC GetDC(IntPtr hwnd)
+        {
+            SafeDC dc = null;
+            try
+            {
+                dc = NativeMethods.GetDC(hwnd);
+            }
+            finally
+            {
+                if (dc != null)
+                {
+                    dc.Hwnd = hwnd;
+                }
+            }
+
+            if (dc.IsInvalid)
+            {
+                // GetDC does not set the last error...
+                HRESULT.E_FAIL.ThrowIfFailed();
+            }
+
+            return dc;
+        }
+
+        public static SafeDC GetDesktop()
+        {
+            return GetDC(IntPtr.Zero);
+        }
+
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static SafeDC WrapDC(IntPtr hdc)
+        {
+            // This won't actually get released by the class, but it allows an IntPtr to be converted for signatures.
+            return new SafeDC
+            {
+                handle = hdc,
+                _created = false,
+                _hwnd = IntPtr.Zero,
+            };
+        }
+    }
+
+    internal sealed class SafeHBITMAP : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        private SafeHBITMAP() : base(true) { }
+
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        protected override bool ReleaseHandle()
+        {
+            return NativeMethods.DeleteObject(handle);
+        }
+    }
+
+    internal sealed class SafeGdiplusStartupToken : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        private SafeGdiplusStartupToken() : base(true) { }
+
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        protected override bool ReleaseHandle()
+        {
+            Status s = NativeMethods.GdiplusShutdown(this.handle);
+            return s == Status.Ok;
+        }
+
+        [SuppressMessage("Microsoft.Reliability", "CA2000:Dispose objects before losing scope")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Usage", "CA2201:DoNotRaiseReservedExceptionTypes")]
+        public static SafeGdiplusStartupToken Startup()
+        {
+            SafeGdiplusStartupToken safeHandle = new SafeGdiplusStartupToken();
+            IntPtr unsafeHandle;
+            StartupOutput output;
+            Status s = NativeMethods.GdiplusStartup(out unsafeHandle, new StartupInput(), out output);
+            if (s == Status.Ok)
+            {
+                safeHandle.handle = unsafeHandle;
+                return safeHandle;
+            }
+            safeHandle.Dispose();
+            throw new Exception("Unable to initialize GDI+");
+        }
+    }
+
+    internal sealed class SafeConnectionPointCookie : SafeHandleZeroOrMinusOneIsInvalid
+    {
+        private IConnectionPoint _cp;
+        // handle holds the cookie value.
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "IConnectionPoint")]
+        public SafeConnectionPointCookie(IConnectionPointContainer target, object sink, Guid eventId)
+            : base(true)
+        {
+            Verify.IsNotNull(target, "target");
+            Verify.IsNotNull(sink, "sink");
+            Verify.IsNotDefault(eventId, "eventId");
+
+            handle = IntPtr.Zero;
+
+            IConnectionPoint cp = null;
+            try
+            {
+                int dwCookie;
+                target.FindConnectionPoint(ref eventId, out cp);
+                cp.Advise(sink, out dwCookie);
+                if (dwCookie == 0)
+                {
+                    throw new InvalidOperationException("IConnectionPoint::Advise returned an invalid cookie.");
+                }
+                handle = new IntPtr(dwCookie);
+                _cp = cp;
+                cp = null;
+            }
+            finally
+            {
+                Utility.SafeRelease(ref cp);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public void Disconnect()
+        {
+            ReleaseHandle();
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
+        protected override bool ReleaseHandle()
+        {
+            try
+            {
+                if (!this.IsInvalid)
+                {
+                    int dwCookie = handle.ToInt32();
+                    handle = IntPtr.Zero;
+
+                    Assert.IsNotNull(_cp);
+                    try
+                    {
+                        _cp.Unadvise(dwCookie);
+                    }
+                    finally
+                    {
+                        Utility.SafeRelease(ref _cp);
+                    }
+                }
+                return true;
+            }
+            catch
+            {
+                return false;
+            }
+        }
+    }
+
+    #endregion
+
+    #region Native Types
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct BLENDFUNCTION
+    {
+        // Must be AC_SRC_OVER
+        public AC BlendOp;
+        // Must be 0.
+        public byte BlendFlags;
+        // Alpha transparency between 0 (transparent) - 255 (opaque)
+        public byte SourceConstantAlpha;
+        // Must be AC_SRC_ALPHA
+        public AC AlphaFormat;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct HIGHCONTRAST 
+    {
+        public int cbSize;
+        public HCF dwFlags;
+        //[MarshalAs(UnmanagedType.LPWStr, SizeConst=80)]
+        //public String lpszDefaultScheme;
+        public IntPtr lpszDefaultScheme;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct RGBQUAD
+    {
+        public byte rgbBlue;
+        public byte rgbGreen;
+        public byte rgbRed;
+        public byte rgbReserved;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack = 2)]
+    internal struct BITMAPINFOHEADER
+    {
+        public int biSize;
+        public int biWidth;
+        public int biHeight;
+        public short biPlanes;
+        public short biBitCount;
+        public BI biCompression;
+        public int biSizeImage;
+        public int biXPelsPerMeter;
+        public int biYPelsPerMeter;
+        public int biClrUsed;
+        public int biClrImportant;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct BITMAPINFO
+    {
+        public BITMAPINFOHEADER bmiHeader;
+        public RGBQUAD bmiColors;
+    }
+
+    // Win7 only.
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct CHANGEFILTERSTRUCT
+    {
+        public uint cbSize;
+        public MSGFLTINFO ExtStatus;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct CREATESTRUCT
+    {
+        public IntPtr lpCreateParams;
+        public IntPtr hInstance;
+        public IntPtr hMenu;
+        public IntPtr hwndParent;
+        public int cy;
+        public int cx;
+        public int y;
+        public int x;
+        public WS style;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszName;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszClass;
+        public WS_EX dwExStyle;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode, Pack = 1)]
+    internal struct SHFILEOPSTRUCT
+    {
+        public IntPtr hwnd;
+        [MarshalAs(UnmanagedType.U4)]
+        public FO wFunc;
+        // double-null terminated arrays of LPWSTRS
+        public string pFrom;
+        public string pTo;
+        [MarshalAs(UnmanagedType.U2)]
+        public FOF fFlags;
+        [MarshalAs(UnmanagedType.Bool)]
+        public int fAnyOperationsAborted;
+        public IntPtr hNameMappings;
+        public string lpszProgressTitle;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct TITLEBARINFO
+    {
+        public int cbSize;
+        public RECT rcTitleBar;
+        public STATE_SYSTEM rgstate_TitleBar;
+        public STATE_SYSTEM rgstate_Reserved;
+        public STATE_SYSTEM rgstate_MinimizeButton;
+        public STATE_SYSTEM rgstate_MaximizeButton;
+        public STATE_SYSTEM rgstate_HelpButton;
+        public STATE_SYSTEM rgstate_CloseButton;
+    }
+
+    // New to Vista.
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct TITLEBARINFOEX
+    {
+        public int cbSize;
+        public RECT rcTitleBar;
+        public STATE_SYSTEM rgstate_TitleBar;
+        public STATE_SYSTEM rgstate_Reserved;
+        public STATE_SYSTEM rgstate_MinimizeButton;
+        public STATE_SYSTEM rgstate_MaximizeButton;
+        public STATE_SYSTEM rgstate_HelpButton;
+        public STATE_SYSTEM rgstate_CloseButton;
+        public RECT rgrect_TitleBar;
+        public RECT rgrect_Reserved;
+        public RECT rgrect_MinimizeButton;
+        public RECT rgrect_MaximizeButton;
+        public RECT rgrect_HelpButton;
+        public RECT rgrect_CloseButton;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential)]
+    internal class NOTIFYICONDATA
+    {
+        public int cbSize;
+        public IntPtr hWnd;
+        public int uID;
+        public NIF uFlags;
+        public int uCallbackMessage;
+        public IntPtr hIcon;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 128)]
+        public char[] szTip = new char[128];
+        /// <summary>
+        /// The state of the icon.  There are two flags that can be set independently.
+        /// NIS_HIDDEN = 1.  The icon is hidden.
+        /// NIS_SHAREDICON = 2.  The icon is shared.
+        /// </summary>
+        public uint dwState;
+        public uint dwStateMask;
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 256)]
+        public char[] szInfo = new char[256];
+        // Prior to Vista this was a union of uTimeout and uVersion.  As of Vista, uTimeout has been deprecated.
+        public uint uVersion;  // Used with Shell_NotifyIcon flag NIM_SETVERSION.
+        [MarshalAs(UnmanagedType.ByValArray, SizeConst = 64)]
+        public char[] szInfoTitle = new char[64];
+        public uint dwInfoFlags;
+        public Guid guidItem;
+        // Vista only
+        IntPtr hBalloonIcon;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Explicit)]
+    internal class PROPVARIANT : IDisposable
+    {
+        private static class NativeMethods
+        {
+            [DllImport("ole32.dll")]
+            internal static extern HRESULT PropVariantClear(PROPVARIANT pvar);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [FieldOffset(0)]
+        private ushort vt;
+        [SuppressMessage("Microsoft.Reliability", "CA2006:UseSafeHandleToEncapsulateNativeResources")]
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [FieldOffset(8)]
+        private IntPtr pointerVal;
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [FieldOffset(8)]
+        private byte byteVal;
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [FieldOffset(8)]
+        private long longVal;
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        [FieldOffset(8)]
+        private short boolVal;
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public VarEnum VarType
+        {
+            get { return (VarEnum)vt; }
+        }
+
+        // Right now only using this for strings.
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public string GetValue()
+        {
+            if (vt == (ushort)VarEnum.VT_LPWSTR)
+            {
+                return Marshal.PtrToStringUni(pointerVal);
+            }
+
+            return null;
+        }
+
+        public void SetValue(bool f)
+        {
+            Clear();
+            vt = (ushort)VarEnum.VT_BOOL;
+            boolVal = (short)(f ? -1 : 0);
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public void SetValue(string val)
+        {
+            Clear();
+            vt = (ushort)VarEnum.VT_LPWSTR;
+            pointerVal = Marshal.StringToCoTaskMemUni(val);
+        }
+
+        public void Clear()
+        {
+            HRESULT hr = NativeMethods.PropVariantClear(this);
+            Assert.IsTrue(hr.Succeeded);
+        }
+
+        #region IDisposable Pattern
+
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        ~PROPVARIANT()
+        {
+            Dispose(false);
+        }
+
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "disposing")]
+        private void Dispose(bool disposing)
+        {
+            Clear();
+        }
+
+        #endregion
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal class SHARDAPPIDINFO
+    {
+        [MarshalAs(UnmanagedType.Interface)]
+        object psi;    // The namespace location of the the item that should be added to the recent docs folder.
+        [MarshalAs(UnmanagedType.LPWStr)]
+        string pszAppID;  // The id of the application that should be associated with this recent doc.
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal class SHARDAPPIDINFOIDLIST
+    {
+        /// <summary>The idlist for the shell item that should be added to the recent docs folder.</summary>
+        IntPtr pidl;
+        /// <summary>The id of the application that should be associated with this recent doc.</summary>
+        [MarshalAs(UnmanagedType.LPWStr)]
+        string pszAppID;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal class SHARDAPPIDINFOLINK
+    {
+        IntPtr psl;     // An IShellLink instance that when launched opens a recently used item in the specified 
+        // application. This link is not added to the recent docs folder, but will be added to the
+        // specified application's destination list.
+        [MarshalAs(UnmanagedType.LPWStr)]
+        string pszAppID;  // The id of the application that should be associated with this recent doc.
+    }
+
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct LOGFONT
+    {
+        public int lfHeight;
+        public int lfWidth;
+        public int lfEscapement;
+        public int lfOrientation;
+        public int lfWeight;
+        public byte lfItalic;
+        public byte lfUnderline;
+        public byte lfStrikeOut;
+        public byte lfCharSet;
+        public byte lfOutPrecision;
+        public byte lfClipPrecision;
+        public byte lfQuality;
+        public byte lfPitchAndFamily;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 32)]
+        public string lfFaceName;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MINMAXINFO
+    {
+        public POINT ptReserved;
+        public POINT ptMaxSize;
+        public POINT ptMaxPosition;
+        public POINT ptMinTrackSize;
+        public POINT ptMaxTrackSize;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct NONCLIENTMETRICS
+    {
+        public int cbSize;
+        public int iBorderWidth;
+        public int iScrollWidth;
+        public int iScrollHeight;
+        public int iCaptionWidth;
+        public int iCaptionHeight;
+        public LOGFONT lfCaptionFont;
+        public int iSmCaptionWidth;
+        public int iSmCaptionHeight;
+        public LOGFONT lfSmCaptionFont;
+        public int iMenuWidth;
+        public int iMenuHeight;
+        public LOGFONT lfMenuFont;
+        public LOGFONT lfStatusFont;
+        public LOGFONT lfMessageFont;
+        // Vista only
+        public int iPaddedBorderWidth;
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static NONCLIENTMETRICS VistaMetricsStruct
+        {
+            get
+            {
+                var ncm = new NONCLIENTMETRICS();
+                ncm.cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS));
+                return ncm;
+            }
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static NONCLIENTMETRICS XPMetricsStruct
+        {
+            get
+            {
+                var ncm = new NONCLIENTMETRICS();
+                // Account for the missing iPaddedBorderWidth
+                ncm.cbSize = Marshal.SizeOf(typeof(NONCLIENTMETRICS)) - sizeof(int);
+                return ncm;
+            }
+        }
+    }
+
+    /// <summary>Defines options that are used to set window visual style attributes.</summary>
+    [StructLayout(LayoutKind.Explicit)]
+    internal struct WTA_OPTIONS
+    {
+        // public static readonly uint Size = (uint)Marshal.SizeOf(typeof(WTA_OPTIONS));
+        public const uint Size = 8;
+
+        /// <summary>
+        /// A combination of flags that modify window visual style attributes.
+        /// Can be a combination of the WTNCA constants.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
+        [FieldOffset(0)]
+        public WTNCA dwFlags;
+
+        /// <summary>
+        /// A bitmask that describes how the values specified in dwFlags should be applied.
+        /// If the bit corresponding to a value in dwFlags is 0, that flag will be removed.
+        /// If the bit is 1, the flag will be added.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used by native code.")]
+        [FieldOffset(4)]
+        public WTNCA dwMask;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MARGINS
+    {
+        /// <summary>Width of left border that retains its size.</summary>
+        public int cxLeftWidth;
+        /// <summary>Width of right border that retains its size.</summary>
+        public int cxRightWidth;
+        /// <summary>Height of top border that retains its size.</summary>
+        public int cyTopHeight;
+        /// <summary>Height of bottom border that retains its size.</summary>
+        public int cyBottomHeight;
+    };
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class MONITORINFO
+    {
+        public int cbSize = Marshal.SizeOf(typeof(MONITORINFO));
+        public RECT rcMonitor;
+        public RECT rcWork;
+        public int dwFlags;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct POINT
+    {
+        public int x;
+        public int y;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential)]
+    internal class RefPOINT
+    {
+        public int x;
+        public int y;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct RECT
+    {
+        private int _left;
+        private int _top;
+        private int _right;
+        private int _bottom;
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public void Offset(int dx, int dy)
+        {
+            _left += dx;
+            _top += dy;
+            _right += dx;
+            _bottom += dy;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Left
+        {
+            get { return _left; }
+            set { _left = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Right
+        {
+            get { return _right; }
+            set { _right = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Top
+        {
+            get { return _top; }
+            set { _top = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Bottom
+        {
+            get { return _bottom; }
+            set { _bottom = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Width
+        {
+            get { return _right - _left; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Height
+        {
+            get { return _bottom - _top; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public POINT Position
+        {
+            get { return new POINT { x = _left, y = _top }; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public SIZE Size
+        {
+            get { return new SIZE { cx = Width, cy = Height }; }
+        }
+
+        public static RECT Union(RECT rect1, RECT rect2)
+        {
+            return new RECT
+            {
+                Left = Math.Min(rect1.Left, rect2.Left),
+                Top = Math.Min(rect1.Top, rect2.Top),
+                Right = Math.Max(rect1.Right, rect2.Right),
+                Bottom = Math.Max(rect1.Bottom, rect2.Bottom),
+            };
+        }
+
+        public override bool Equals(object obj)
+        {
+            try
+            {
+                var rc = (RECT)obj;
+                return rc._bottom == _bottom
+                    && rc._left == _left
+                    && rc._right == _right
+                    && rc._top == _top;
+            }
+            catch (InvalidCastException)
+            {
+                return false;
+            }
+        }
+
+        public override int GetHashCode()
+        {
+            return (_left << 16 | Utility.LOWORD(_right)) ^ (_top << 16 | Utility.LOWORD(_bottom));
+        }
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential)]
+    internal class RefRECT
+    {
+        private int _left;
+        private int _top;
+        private int _right;
+        private int _bottom;
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public RefRECT(int left, int top, int right, int bottom)
+        {
+            _left = left;
+            _top = top;
+            _right = right;
+            _bottom = bottom;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Width
+        {
+            get { return _right - _left; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Height
+        {
+            get { return _bottom - _top; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Left
+        {
+            get { return _left; }
+            set { _left = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Right
+        {
+            get { return _right; }
+            set { _right = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Top
+        {
+            get { return _top; }
+            set { _top = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public int Bottom
+        {
+            get { return _bottom; }
+            set { _bottom = value; }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public void Offset(int dx, int dy)
+        {
+            _left += dx;
+            _top += dy;
+            _right += dx;
+            _bottom += dy;
+        }
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct SIZE
+    {
+        public int cx;
+        public int cy;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct StartupOutput
+    {
+        public IntPtr hook;
+        public IntPtr unhook;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class StartupInput
+    {
+        public int GdiplusVersion = 1;
+        public IntPtr DebugEventCallback;
+        public bool SuppressBackgroundThread;
+        public bool SuppressExternalCodecs;
+    }
+
+    [SuppressMessage("Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses")]
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    [BestFitMapping(false)]
+    internal class WIN32_FIND_DATAW
+    {
+        public FileAttributes dwFileAttributes;
+        public System.Runtime.InteropServices.ComTypes.FILETIME ftCreationTime;
+        public System.Runtime.InteropServices.ComTypes.FILETIME ftLastAccessTime;
+        public System.Runtime.InteropServices.ComTypes.FILETIME ftLastWriteTime;
+        public int nFileSizeHigh;
+        public int nFileSizeLow;
+        public int dwReserved0;
+        public int dwReserved1;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+        public string cFileName;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 14)]
+        public string cAlternateFileName;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal class WINDOWPLACEMENT
+    {
+        public int length = Marshal.SizeOf(typeof(WINDOWPLACEMENT));
+        public int flags;
+        public SW showCmd;
+        public POINT ptMinPosition;
+        public POINT ptMaxPosition;
+        public RECT rcNormalPosition;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct WINDOWPOS
+    {
+        public IntPtr hwnd;
+        public IntPtr hwndInsertAfter;
+        public int x;
+        public int y;
+        public int cx;
+        public int cy;
+        public int flags;
+    }
+
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    internal struct WNDCLASSEX
+    {
+        public int cbSize;
+        public CS style;
+        public WndProc lpfnWndProc;
+        public int cbClsExtra;
+        public int cbWndExtra;
+        public IntPtr hInstance;
+        public IntPtr hIcon;
+        public IntPtr hCursor;
+        public IntPtr hbrBackground;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszMenuName;
+        [MarshalAs(UnmanagedType.LPWStr)]
+        public string lpszClassName;
+        public IntPtr hIconSm;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct MOUSEINPUT
+    {
+        public int dx;
+        public int dy;
+        public int mouseData;
+        public int dwFlags;
+        public int time;
+        public IntPtr dwExtraInfo;
+    }
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct INPUT
+    {
+        public uint type;
+        public MOUSEINPUT mi;
+    };
+
+    [StructLayout(LayoutKind.Sequential)]
+    internal struct UNSIGNED_RATIO
+    {
+        public uint uiNumerator;
+        public uint uiDenominator;
+    }
+
+    [StructLayout(LayoutKind.Sequential, Pack=1)]
+    internal struct DWM_TIMING_INFO
+    {
+        public int cbSize;
+        public UNSIGNED_RATIO rateRefresh;
+        public ulong qpcRefreshPeriod;
+        public UNSIGNED_RATIO rateCompose;
+        public ulong qpcVBlank;
+        public ulong cRefresh;
+        public uint cDXRefresh;
+        public ulong qpcCompose;
+        public ulong cFrame;
+        public uint cDXPresent;
+        public ulong cRefreshFrame;
+        public ulong cFrameSubmitted;
+        public uint cDXPresentSubmitted;
+        public ulong cFrameConfirmed;
+        public uint cDXPresentConfirmed;
+        public ulong cRefreshConfirmed;
+        public uint cDXRefreshConfirmed;
+        public ulong cFramesLate;
+        public uint cFramesOutstanding;
+        public ulong cFrameDisplayed;
+        public ulong qpcFrameDisplayed;
+        public ulong cRefreshFrameDisplayed;
+        public ulong cFrameComplete;
+        public ulong qpcFrameComplete;
+        public ulong cFramePending;
+        public ulong qpcFramePending;
+        public ulong cFramesDisplayed;
+        public ulong cFramesComplete;
+        public ulong cFramesPending;
+        public ulong cFramesAvailable;
+        public ulong cFramesDropped;
+        public ulong cFramesMissed;
+        public ulong cRefreshNextDisplayed;
+        public ulong cRefreshNextPresented;
+        public ulong cRefreshesDisplayed;
+        public ulong cRefreshesPresented;
+        public ulong cRefreshStarted;
+        public ulong cPixelsReceived;
+        public ulong cPixelsDrawn;
+        public ulong cBuffersEmpty;
+    }
+
+    #endregion
+
+    /// <summary>Delegate declaration that matches native WndProc signatures.</summary>
+    internal delegate IntPtr WndProc(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam);
+
+    /// <summary>Delegate declaration that matches native WndProc signatures.</summary>
+    internal delegate IntPtr WndProcHook(IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam, ref bool handled);
+
+    /// <summary>Delegate declaration that matches managed WndProc signatures.</summary>
+    internal delegate IntPtr MessageHandler(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled);
+
+    // Some native methods are shimmed through public versions that handle converting failures into thrown exceptions.
+    internal static class NativeMethods
+    {
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "AdjustWindowRectEx", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _AdjustWindowRectEx(ref RECT lpRect, WS dwStyle, [MarshalAs(UnmanagedType.Bool)] bool bMenu, WS_EX dwExStyle);
+
+        public static RECT AdjustWindowRectEx(RECT lpRect, WS dwStyle, bool bMenu, WS_EX dwExStyle)
+        {
+            // Native version modifies the parameter in place.
+            if (!_AdjustWindowRectEx(ref lpRect, dwStyle, bMenu, dwExStyle))
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return lpRect;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilter", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _ChangeWindowMessageFilter(WM message, MSGFLT dwFlag);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "ChangeWindowMessageFilterEx", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, [In, Out, Optional] ref CHANGEFILTERSTRUCT pChangeFilterStruct);
+
+        // Note that processes at or below SECURITY_MANDATORY_LOW_RID are not allowed to change the message filter.
+        // If those processes call this function, it will fail and generate the extended error code, ERROR_ACCESS_DENIED.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static HRESULT ChangeWindowMessageFilterEx(IntPtr hwnd, WM message, MSGFLT action, out MSGFLTINFO filterInfo)
+        {
+            filterInfo = MSGFLTINFO.NONE;
+
+            bool ret;
+
+            // This origins of this API were added for Vista.  The Ex version was added for Windows 7.
+            // If we're not on either, then this message filter isolation doesn't exist.
+            if (!Utility.IsOSVistaOrNewer)
+            {
+                return HRESULT.S_FALSE;
+            }
+
+            // If we're on Vista rather than Win7 then we can't use the Ex version of this function.
+            // The Ex version is preferred if possible because this results in process-wide modifications of the filter
+            // and is deprecated as of Win7.
+            if (!Utility.IsOSWindows7OrNewer)
+            {
+                // Note that the Win7 MSGFLT_ALLOW/DISALLOW enum values map to the Vista MSGFLT_ADD/REMOVE
+                ret = _ChangeWindowMessageFilter(message, action);
+                if (!ret)
+                {
+                    return (HRESULT)Win32Error.GetLastError();
+                }
+                return HRESULT.S_OK;
+            }
+
+            var filterstruct = new CHANGEFILTERSTRUCT { cbSize = (uint)Marshal.SizeOf(typeof(CHANGEFILTERSTRUCT)) };
+            ret = _ChangeWindowMessageFilterEx(hwnd, message, action, ref filterstruct);
+            if (!ret)
+            {
+                return (HRESULT)Win32Error.GetLastError();
+            }
+
+            filterInfo = filterstruct.ExtStatus;
+            return HRESULT.S_OK;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll")]
+        public static extern CombineRgnResult CombineRgn(IntPtr hrgnDest, IntPtr hrgnSrc1, IntPtr hrgnSrc2, RGN fnCombineMode);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll", EntryPoint = "CommandLineToArgvW", CharSet = CharSet.Unicode)]
+        private static extern IntPtr _CommandLineToArgvW([MarshalAs(UnmanagedType.LPWStr)] string cmdLine, out int numArgs);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static string[] CommandLineToArgvW(string cmdLine)
+        {
+            IntPtr argv = IntPtr.Zero;
+            try
+            {
+                int numArgs = 0;
+
+                argv = _CommandLineToArgvW(cmdLine, out numArgs);
+                if (argv == IntPtr.Zero)
+                {
+                    throw new Win32Exception();
+                }
+                var result = new string[numArgs];
+
+                for (int i = 0; i < numArgs; i++)
+                {
+                    IntPtr currArg = Marshal.ReadIntPtr(argv, i * Marshal.SizeOf(typeof(IntPtr)));
+                    result[i] = Marshal.PtrToStringUni(currArg);
+                }
+
+                return result;
+            }
+            finally
+            {
+
+                IntPtr p = _LocalFree(argv);
+                // Otherwise LocalFree failed.
+                Assert.AreEqual(IntPtr.Zero, p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
+        private static extern SafeHBITMAP _CreateDIBSection(SafeDC hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, [Out] out IntPtr ppvBits, IntPtr hSection, int dwOffset);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "CreateDIBSection", SetLastError = true)]
+        private static extern SafeHBITMAP _CreateDIBSectionIntPtr(IntPtr hdc, [In] ref BITMAPINFO bitmapInfo, int iUsage, [Out] out IntPtr ppvBits, IntPtr hSection, int dwOffset);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static SafeHBITMAP CreateDIBSection(SafeDC hdc, ref BITMAPINFO bitmapInfo, out IntPtr ppvBits, IntPtr hSection, int dwOffset)
+        {
+            const int DIB_RGB_COLORS = 0;
+            SafeHBITMAP hBitmap = null;
+            if (hdc == null)
+            {
+                hBitmap = _CreateDIBSectionIntPtr(IntPtr.Zero, ref bitmapInfo, DIB_RGB_COLORS, out ppvBits, hSection, dwOffset);
+            }
+            else
+            {
+                hBitmap = _CreateDIBSection(hdc, ref bitmapInfo, DIB_RGB_COLORS, out ppvBits, hSection, dwOffset);
+            }
+
+            if (hBitmap.IsInvalid)
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return hBitmap;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "CreateRoundRectRgn", SetLastError = true)]
+        private static extern IntPtr _CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr CreateRoundRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect, int nWidthEllipse, int nHeightEllipse)
+        {
+            IntPtr ret = _CreateRoundRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect, nWidthEllipse, nHeightEllipse);
+            if (IntPtr.Zero == ret)
+            {
+                throw new Win32Exception();
+            }
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "CreateRectRgn", SetLastError = true)]
+        private static extern IntPtr _CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr CreateRectRgn(int nLeftRect, int nTopRect, int nRightRect, int nBottomRect)
+        {
+            IntPtr ret = _CreateRectRgn(nLeftRect, nTopRect, nRightRect, nBottomRect);
+            if (IntPtr.Zero == ret)
+            {
+                throw new Win32Exception();
+            }
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "CreateRectRgnIndirect", SetLastError = true)]
+        private static extern IntPtr _CreateRectRgnIndirect([In] ref RECT lprc);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr CreateRectRgnIndirect(RECT lprc)
+        {
+            IntPtr ret = _CreateRectRgnIndirect(ref lprc);
+            if (IntPtr.Zero == ret)
+            {
+                throw new Win32Exception();
+            }
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll")]
+        public static extern IntPtr CreateSolidBrush(int crColor);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true, CharSet = CharSet.Unicode, EntryPoint = "CreateWindowExW")]
+        private static extern IntPtr _CreateWindowEx(
+            WS_EX dwExStyle,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpClassName,
+            [MarshalAs(UnmanagedType.LPWStr)] string lpWindowName,
+            WS dwStyle,
+            int x,
+            int y,
+            int nWidth,
+            int nHeight,
+            IntPtr hWndParent,
+            IntPtr hMenu,
+            IntPtr hInstance,
+            IntPtr lpParam);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr CreateWindowEx(
+            WS_EX dwExStyle,
+            string lpClassName,
+            string lpWindowName,
+            WS dwStyle,
+            int x,
+            int y,
+            int nWidth,
+            int nHeight,
+            IntPtr hWndParent,
+            IntPtr hMenu,
+            IntPtr hInstance,
+            IntPtr lpParam)
+        {
+            IntPtr ret = _CreateWindowEx(dwExStyle, lpClassName, lpWindowName, dwStyle, x, y, nWidth, nHeight, hWndParent, hMenu, hInstance, lpParam);
+            if (IntPtr.Zero == ret)
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", CharSet = CharSet.Unicode, EntryPoint = "DefWindowProcW")]
+        public static extern IntPtr DefWindowProc(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DeleteObject(IntPtr hObject);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DestroyIcon(IntPtr handle);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DestroyWindow(IntPtr hwnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool IsWindow(IntPtr hwnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        public static extern void DwmExtendFrameIntoClientArea(IntPtr hwnd, ref MARGINS pMarInset);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", EntryPoint = "DwmIsCompositionEnabled", PreserveSig = false)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _DwmIsCompositionEnabled();
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", EntryPoint = "DwmGetColorizationColor", PreserveSig = true)]
+        private static extern HRESULT _DwmGetColorizationColor(out uint pcrColorization, [Out, MarshalAs(UnmanagedType.Bool)] out bool pfOpaqueBlend);
+
+        public static bool DwmGetColorizationColor(out uint pcrColorization, out bool pfOpaqueBlend)
+        {
+            // Make this call safe to make on downlevel OSes...
+            if (Utility.IsOSVistaOrNewer && IsThemeActive())
+            {
+                HRESULT hr = _DwmGetColorizationColor(out pcrColorization, out pfOpaqueBlend);
+                if (hr.Succeeded)
+                {
+                    return true;
+                }
+            }
+
+            // Default values.  If for some reason the native DWM API fails it's never enough of a reason
+            // to bring down the app.  Empirically it still sometimes returns errors even when the theme service is on.
+            // We'll still use the boolean return value to allow the caller to respond if they care.
+            pcrColorization = 0xFF000000;
+            pfOpaqueBlend = true;
+
+            return false;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool DwmIsCompositionEnabled()
+        {
+            // Make this call safe to make on downlevel OSes...
+            if (!Utility.IsOSVistaOrNewer)
+            {
+                return false;
+            }
+            return _DwmIsCompositionEnabled();
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool DwmDefWindowProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam, out IntPtr plResult);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", EntryPoint = "DwmSetWindowAttribute")]
+        private static extern void _DwmSetWindowAttribute(IntPtr hwnd, DWMWA dwAttribute, ref int pvAttribute, int cbAttribute);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void DwmSetWindowAttributeFlip3DPolicy(IntPtr hwnd, DWMFLIP3D flip3dPolicy)
+        {
+            Assert.IsTrue(Utility.IsOSVistaOrNewer);
+            var dwPolicy = (int)flip3dPolicy;
+            _DwmSetWindowAttribute(hwnd, DWMWA.FLIP3D_POLICY, ref dwPolicy, sizeof(int));
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void DwmSetWindowAttributeDisallowPeek(IntPtr hwnd, bool disallowPeek)
+        {
+            Assert.IsTrue(Utility.IsOSWindows7OrNewer);
+            int dwDisallow = (int)(disallowPeek ? Win32Value.TRUE : Win32Value.FALSE);
+            _DwmSetWindowAttribute(hwnd, DWMWA.DISALLOW_PEEK, ref dwDisallow, sizeof(int));
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "EnableMenuItem")]
+        private static extern int _EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static MF EnableMenuItem(IntPtr hMenu, SC uIDEnableItem, MF uEnable)
+        {
+            // Returns the previous state of the menu item, or -1 if the menu item does not exist.
+            int iRet = _EnableMenuItem(hMenu, uIDEnableItem, uEnable);
+            return (MF)iRet;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "RemoveMenu", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _RemoveMenu(IntPtr hMenu, uint uPosition, uint uFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void RemoveMenu(IntPtr hMenu, SC uPosition, MF uFlags)
+        {
+            if (!_RemoveMenu(hMenu, (uint)uPosition, (uint)uFlags))
+            {
+                throw new Win32Exception();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "DrawMenuBar", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _DrawMenuBar(IntPtr hWnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void DrawMenuBar(IntPtr hWnd)
+        {
+            if (!_DrawMenuBar(hWnd))
+            {
+                throw new Win32Exception();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll")]
+        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool FindClose(IntPtr handle);
+
+        // Not shimming this SetLastError=true function because callers want to evaluate the reason for failure.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", CharSet = CharSet.Unicode, SetLastError = true)]
+        public static extern SafeFindHandle FindFirstFileW(string lpFileName, [In, Out, MarshalAs(UnmanagedType.LPStruct)] WIN32_FIND_DATAW lpFindFileData);
+
+        // Not shimming this SetLastError=true function because callers want to evaluate the reason for failure.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool FindNextFileW(SafeFindHandle hndFindFile, [In, Out, MarshalAs(UnmanagedType.LPStruct)] WIN32_FIND_DATAW lpFindFileData);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "GetClientRect", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _GetClientRect(IntPtr hwnd, [Out] out RECT lpRect);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static RECT GetClientRect(IntPtr hwnd)
+        {
+            RECT rc;
+            if (!_GetClientRect(hwnd, out rc))
+            {
+                HRESULT.ThrowLastError();
+            }
+            return rc;
+        }
+
+        [DllImport("uxtheme.dll", EntryPoint="GetCurrentThemeName", CharSet = CharSet.Unicode)]
+        private static extern HRESULT _GetCurrentThemeName(
+            StringBuilder pszThemeFileName,
+            int dwMaxNameChars,
+            StringBuilder pszColorBuff,
+            int cchMaxColorChars,
+            StringBuilder pszSizeBuff,
+            int cchMaxSizeChars);
+
+        public static void GetCurrentThemeName(out string themeFileName, out string color, out string size)
+        {
+            // Not expecting strings longer than MAX_PATH.  We will return the error 
+            var fileNameBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
+            var colorBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
+            var sizeBuilder = new StringBuilder((int)Win32Value.MAX_PATH);
+
+            // This will throw if the theme service is not active (e.g. not UxTheme!IsThemeActive).
+            _GetCurrentThemeName(fileNameBuilder, fileNameBuilder.Capacity,
+                                 colorBuilder, colorBuilder.Capacity,
+                                 sizeBuilder, sizeBuilder.Capacity)
+                .ThrowIfFailed();
+
+            themeFileName = fileNameBuilder.ToString();
+            color = colorBuilder.ToString();
+            size = sizeBuilder.ToString();
+        }
+
+        [DllImport("uxtheme.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool IsThemeActive();
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [Obsolete("Use SafeDC.GetDC instead.", true)]
+        public static void GetDC() { }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll")]
+        public static extern int GetDeviceCaps(SafeDC hdc, DeviceCap nIndex);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", EntryPoint = "GetModuleFileName", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern int _GetModuleFileName(IntPtr hModule, StringBuilder lpFilename, int nSize);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static string GetModuleFileName(IntPtr hModule)
+        {
+            var buffer = new StringBuilder((int)Win32Value.MAX_PATH);
+            while (true)
+            {
+                int size = _GetModuleFileName(hModule, buffer, buffer.Capacity);
+                if (size == 0)
+                {
+                    HRESULT.ThrowLastError();
+                }
+
+                // GetModuleFileName returns nSize when it's truncated but does NOT set the last error.
+                // MSDN documentation says this has changed in Windows 2000+.
+                if (size == buffer.Capacity)
+                {
+                    // Enlarge the buffer and try again.
+                    buffer.EnsureCapacity(buffer.Capacity * 2);
+                    continue;
+                }
+
+                return buffer.ToString();
+            }
+        }
+
+        [DllImport("kernel32.dll", EntryPoint = "GetModuleHandleW", CharSet = CharSet.Unicode, SetLastError = true)]
+        private static extern IntPtr _GetModuleHandle([MarshalAs(UnmanagedType.LPWStr)] string lpModuleName);
+
+        public static IntPtr GetModuleHandle(string lpModuleName)
+        {
+            IntPtr retPtr = _GetModuleHandle(lpModuleName);
+            if (retPtr == IntPtr.Zero)
+            {
+                HRESULT.ThrowLastError();
+            }
+            return retPtr;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "GetMonitorInfo", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _GetMonitorInfo(IntPtr hMonitor, [In, Out] MONITORINFO lpmi);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static MONITORINFO GetMonitorInfo(IntPtr hMonitor)
+        {
+            var mi = new MONITORINFO();
+            if (!_GetMonitorInfo(hMonitor, mi))
+            {
+                throw new Win32Exception();
+            }
+            return mi;
+        }
+
+        [DllImport("gdi32.dll", EntryPoint = "GetStockObject", SetLastError = true)]
+        private static extern IntPtr _GetStockObject(StockObject fnObject);
+
+        public static IntPtr GetStockObject(StockObject fnObject)
+        {
+            IntPtr retPtr = _GetStockObject(fnObject);
+            if (retPtr == null)
+            {
+                HRESULT.ThrowLastError();
+            }
+            return retPtr;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        public static extern IntPtr GetSystemMenu(IntPtr hWnd, [MarshalAs(UnmanagedType.Bool)] bool bRevert);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        public static extern int GetSystemMetrics(SM nIndex);
+
+        // This is aliased as a macro in 32bit Windows.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr GetWindowLongPtr(IntPtr hwnd, GWL nIndex)
+        {
+            IntPtr ret = IntPtr.Zero;
+            if (8 == IntPtr.Size)
+            {
+                ret = GetWindowLongPtr64(hwnd, nIndex);
+            }
+            else
+            {
+                ret = new IntPtr(GetWindowLongPtr32(hwnd, nIndex));
+            }
+            if (IntPtr.Zero == ret)
+            {
+                throw new Win32Exception();
+            }
+            return ret;
+        }
+
+        /// <summary>
+        /// Sets attributes to control how visual styles are applied to a specified window.
+        /// </summary>
+        /// <param name="hwnd">
+        /// Handle to a window to apply changes to.
+        /// </param>
+        /// <param name="eAttribute">
+        /// Value of type WINDOWTHEMEATTRIBUTETYPE that specifies the type of attribute to set.
+        /// The value of this parameter determines the type of data that should be passed in the pvAttribute parameter.
+        /// Can be the following value:
+        /// <list>WTA_NONCLIENT (Specifies non-client related attributes).</list>
+        /// pvAttribute must be a pointer of type WTA_OPTIONS.
+        /// </param>
+        /// <param name="pvAttribute">
+        /// A pointer that specifies attributes to set. Type is determined by the value of the eAttribute value.
+        /// </param>
+        /// <param name="cbAttribute">
+        /// Specifies the size, in bytes, of the data pointed to by pvAttribute.
+        /// </param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("uxtheme.dll", PreserveSig = false)]
+        public static extern void SetWindowThemeAttribute([In] IntPtr hwnd, [In] WINDOWTHEMEATTRIBUTETYPE eAttribute, [In] ref WTA_OPTIONS pvAttribute, [In] uint cbAttribute);
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "GetWindowLong", SetLastError = true)]
+        private static extern int GetWindowLongPtr32(IntPtr hWnd, GWL nIndex);
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "GetWindowLongPtr", SetLastError = true)]
+        private static extern IntPtr GetWindowLongPtr64(IntPtr hWnd, GWL nIndex);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool GetWindowPlacement(IntPtr hwnd, WINDOWPLACEMENT lpwndpl);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static WINDOWPLACEMENT GetWindowPlacement(IntPtr hwnd)
+        {
+            WINDOWPLACEMENT wndpl = new WINDOWPLACEMENT();
+            if (GetWindowPlacement(hwnd, wndpl))
+            {
+                return wndpl;
+            }
+            throw new Win32Exception();
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "GetWindowRect", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+        public static RECT GetWindowRect(IntPtr hwnd)
+        {
+            RECT rc;
+            if (!_GetWindowRect(hwnd, out rc))
+            {
+                HRESULT.ThrowLastError();
+            }
+            return rc;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdipCreateBitmapFromStream(IStream stream, out IntPtr bitmap);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdipCreateHBITMAPFromBitmap(IntPtr bitmap, out IntPtr hbmReturn, Int32 background);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdipCreateHICONFromBitmap(IntPtr bitmap, out IntPtr hbmReturn);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdipDisposeImage(IntPtr image);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdipImageForceValidation(IntPtr image);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdiplusStartup(out IntPtr token, StartupInput input, out StartupOutput output);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdiplus.dll")]
+        public static extern Status GdiplusShutdown(IntPtr token);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool IsWindowVisible(IntPtr hwnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", EntryPoint = "LocalFree", SetLastError = true)]
+        private static extern IntPtr _LocalFree(IntPtr hMem);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll")]
+        public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "PostMessage", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void PostMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam)
+        {
+            if (!_PostMessage(hWnd, Msg, wParam, lParam))
+            {
+                throw new Win32Exception();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "RegisterClassExW")]
+        private static extern short _RegisterClassEx([In] ref WNDCLASSEX lpwcx);
+
+        // Note that this will throw HRESULT_FROM_WIN32(ERROR_CLASS_ALREADY_EXISTS) on duplicate registration.
+        // If needed, consider adding a Try* version of this function that returns the error code since that
+        // may be ignorable.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static short RegisterClassEx(ref WNDCLASSEX lpwcx)
+        {
+            short ret = _RegisterClassEx(ref lpwcx);
+            if (ret == 0)
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "RegisterWindowMessage", SetLastError = true, CharSet = CharSet.Unicode)]
+        private static extern uint _RegisterWindowMessage([MarshalAs(UnmanagedType.LPWStr)] string lpString);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static WM RegisterWindowMessage(string lpString)
+        {
+            uint iRet = _RegisterWindowMessage(lpString);
+            if (iRet == 0)
+            {
+                HRESULT.ThrowLastError();
+            }
+            return (WM)iRet;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetActiveWindow", SetLastError = true)]
+        private static extern IntPtr _SetActiveWindow(IntPtr hWnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr SetActiveWindow(IntPtr hwnd)
+        {
+            Verify.IsNotDefault(hwnd, "hwnd");
+            IntPtr ret = _SetActiveWindow(hwnd);
+            if (ret == IntPtr.Zero)
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return ret;
+        }
+
+        // This is aliased as a macro in 32bit Windows.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr SetClassLongPtr(IntPtr hwnd, GCLP nIndex, IntPtr dwNewLong)
+        {
+            if (8 == IntPtr.Size)
+            {
+                return SetClassLongPtr64(hwnd, nIndex, dwNewLong);
+            }
+            return new IntPtr(SetClassLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+        }
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetClassLong", SetLastError = true)]
+        private static extern int SetClassLongPtr32(IntPtr hWnd, GCLP nIndex, int dwNewLong);
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetClassLongPtr", SetLastError = true)]
+        private static extern IntPtr SetClassLongPtr64(IntPtr hWnd, GCLP nIndex, IntPtr dwNewLong);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", SetLastError = true)]
+        public static extern ErrorModes SetErrorMode(ErrorModes newMode);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("kernel32.dll", SetLastError = true, EntryPoint = "SetProcessWorkingSetSize")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _SetProcessWorkingSetSize(IntPtr hProcess, IntPtr dwMinimiumWorkingSetSize, IntPtr dwMaximumWorkingSetSize);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SetProcessWorkingSetSize(IntPtr hProcess, int dwMinimumWorkingSetSize, int dwMaximumWorkingSetSize)
+        {
+            if (!_SetProcessWorkingSetSize(hProcess, new IntPtr(dwMinimumWorkingSetSize), new IntPtr(dwMaximumWorkingSetSize)))
+            {
+                throw new Win32Exception();
+            }
+        }
+
+        // This is aliased as a macro in 32bit Windows.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr SetWindowLongPtr(IntPtr hwnd, GWL nIndex, IntPtr dwNewLong)
+        {
+            if (8 == IntPtr.Size)
+            {
+                return SetWindowLongPtr64(hwnd, nIndex, dwNewLong);
+            }
+            return new IntPtr(SetWindowLongPtr32(hwnd, nIndex, dwNewLong.ToInt32()));
+        }
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetWindowLong", SetLastError = true)]
+        private static extern int SetWindowLongPtr32(IntPtr hWnd, GWL nIndex, int dwNewLong);
+
+        [SuppressMessage("Microsoft.Interoperability", "CA1400:PInvokeEntryPointsShouldExist")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetWindowLongPtr", SetLastError = true)]
+        private static extern IntPtr SetWindowLongPtr64(IntPtr hWnd, GWL nIndex, IntPtr dwNewLong);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetWindowRgn", SetLastError = true)]
+        private static extern int _SetWindowRgn(IntPtr hWnd, IntPtr hRgn, [MarshalAs(UnmanagedType.Bool)] bool bRedraw);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw)
+        {
+            int err = _SetWindowRgn(hWnd, hRgn, bRedraw);
+            if (0 == err)
+            {
+                throw new Win32Exception();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SetWindowPos", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int x, int y, int cx, int cy, SWP uFlags)
+        {
+            if (!_SetWindowPos(hWnd, hWndInsertAfter, x, y, cx, cy, uFlags))
+            {
+                // If this fails it's never worth taking down the process.  Let the caller deal with the error if they want.
+                return false;
+            }
+
+            return true;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll", SetLastError = false)]
+        public static extern Win32Error SHFileOperation(ref SHFILEOPSTRUCT lpFileOp);
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool ShowWindow(IntPtr hwnd, SW nCmdShow);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SystemParametersInfoW", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _SystemParametersInfo_String(SPI uiAction, int uiParam, [MarshalAs(UnmanagedType.LPWStr)] string pvParam, SPIF fWinIni);
+
+        /// <summary>Overload of SystemParametersInfo for getting and setting NONCLIENTMETRICS.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SystemParametersInfoW", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _SystemParametersInfo_NONCLIENTMETRICS(SPI uiAction, int uiParam, [In, Out] ref NONCLIENTMETRICS pvParam, SPIF fWinIni);
+
+        /// <summary>Overload of SystemParametersInfo for getting and setting HIGHCONTRAST.</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "SystemParametersInfoW", SetLastError = true, CharSet = CharSet.Unicode)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _SystemParametersInfo_HIGHCONTRAST(SPI uiAction, int uiParam, [In, Out] ref HIGHCONTRAST pvParam, SPIF fWinIni);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SystemParametersInfo(SPI uiAction, int uiParam, string pvParam, SPIF fWinIni)
+        {
+            if (!_SystemParametersInfo_String(uiAction, uiParam, pvParam, fWinIni))
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static NONCLIENTMETRICS SystemParameterInfo_GetNONCLIENTMETRICS()
+        {
+            var metrics = Utility.IsOSVistaOrNewer
+                ? NONCLIENTMETRICS.VistaMetricsStruct
+                : NONCLIENTMETRICS.XPMetricsStruct;
+
+            if (!_SystemParametersInfo_NONCLIENTMETRICS(SPI.GETNONCLIENTMETRICS, metrics.cbSize, ref metrics, SPIF.None))
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return metrics;
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static HIGHCONTRAST SystemParameterInfo_GetHIGHCONTRAST()
+        {
+            var hc = new HIGHCONTRAST { cbSize = Marshal.SizeOf(typeof(HIGHCONTRAST)) };
+
+            if (!_SystemParametersInfo_HIGHCONTRAST(SPI.GETHIGHCONTRAST, hc.cbSize, ref hc, SPIF.None))
+            {
+                HRESULT.ThrowLastError();
+            }
+
+            return hc;
+        }
+
+        // This function is strange in that it returns a BOOL if TPM_RETURNCMD isn't specified, but otherwise the command Id.
+        // Currently it's only used with TPM_RETURNCMD, so making the signature match that.
+        [DllImport("user32.dll")]
+        public static extern uint TrackPopupMenuEx(IntPtr hmenu, uint fuFlags, int x, int y, IntPtr hwnd, IntPtr lptpm);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
+        private static extern IntPtr _SelectObject(SafeDC hdc, IntPtr hgdiobj);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr SelectObject(SafeDC hdc, IntPtr hgdiobj)
+        {
+            IntPtr ret = _SelectObject(hdc, hgdiobj);
+            if (ret == IntPtr.Zero)
+            {
+                HRESULT.ThrowLastError();
+            }
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("gdi32.dll", EntryPoint = "SelectObject", SetLastError = true)]
+        private static extern IntPtr _SelectObjectSafeHBITMAP(SafeDC hdc, SafeHBITMAP hgdiobj);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr SelectObject(SafeDC hdc, SafeHBITMAP hgdiobj)
+        {
+            IntPtr ret = _SelectObjectSafeHBITMAP(hdc, hgdiobj);
+            if (ret == IntPtr.Zero)
+            {
+                HRESULT.ThrowLastError();
+            }
+            return ret;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern int SendInput(int nInputs, ref INPUT pInputs, int cbSize);
+
+        // Depending on the message, callers may want to call GetLastError based on the return value.
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern IntPtr SendMessage(IntPtr hWnd, WM Msg, IntPtr wParam, IntPtr lParam);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "UnregisterClass", SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _UnregisterClassAtom(IntPtr lpClassName, IntPtr hInstance);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", EntryPoint = "UnregisterClass", CharSet = CharSet.Unicode, SetLastError = true)]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _UnregisterClassName(string lpClassName, IntPtr hInstance);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void UnregisterClass(short atom, IntPtr hinstance)
+        {
+            if (!_UnregisterClassAtom(new IntPtr(atom), hinstance))
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+
+        public static void UnregisterClass(string lpClassName, IntPtr hInstance)
+        {
+            if (!_UnregisterClassName(lpClassName, hInstance))
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "UpdateLayeredWindow")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _UpdateLayeredWindow(
+            IntPtr hwnd,
+            SafeDC hdcDst,
+            [In] ref POINT pptDst,
+            [In] ref SIZE psize,
+            SafeDC hdcSrc,
+            [In] ref POINT pptSrc,
+            int crKey,
+            ref BLENDFUNCTION pblend,
+            ULW dwFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("user32.dll", SetLastError = true, EntryPoint = "UpdateLayeredWindow")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool _UpdateLayeredWindowIntPtr(
+            IntPtr hwnd,
+            IntPtr hdcDst,
+            IntPtr pptDst,
+            IntPtr psize,
+            IntPtr hdcSrc,
+            IntPtr pptSrc,
+            int crKey,
+            ref BLENDFUNCTION pblend,
+            ULW dwFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void UpdateLayeredWindow(
+            IntPtr hwnd,
+            SafeDC hdcDst,
+            ref POINT pptDst,
+            ref SIZE psize,
+            SafeDC hdcSrc,
+            ref POINT pptSrc,
+            int crKey,
+            ref BLENDFUNCTION pblend,
+            ULW dwFlags)
+        {
+            if (!_UpdateLayeredWindow(hwnd, hdcDst, ref pptDst, ref psize, hdcSrc, ref pptSrc, crKey, ref pblend, dwFlags))
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void UpdateLayeredWindow(
+            IntPtr hwnd,
+            int crKey,
+            ref BLENDFUNCTION pblend,
+            ULW dwFlags)
+        {
+            if (!_UpdateLayeredWindowIntPtr(hwnd, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, crKey, ref pblend, dwFlags))
+            {
+                HRESULT.ThrowLastError();
+            }
+        }
+
+        #region Win7 declarations
+
+        [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
+        private static extern void _SHAddToRecentDocs_String(SHARD uFlags, [MarshalAs(UnmanagedType.LPWStr)] string pv);
+
+        // This overload is required.  There's a cast in the Shell code that causes the wrong vtbl to be used
+        // if we let the marshaller convert the parameter to an IUnknown.
+        [DllImport("shell32.dll", EntryPoint = "SHAddToRecentDocs")]
+        private static extern void _SHAddToRecentDocs_ShellLink(SHARD uFlags, IShellLinkW pv);
+
+        public static void SHAddToRecentDocs(string path)
+        {
+            _SHAddToRecentDocs_String(SHARD.PATHW, path);
+        }
+
+        // Win7 only.
+        public static void SHAddToRecentDocs(IShellLinkW shellLink)
+        {
+            _SHAddToRecentDocs_ShellLink(SHARD.LINK, shellLink);
+        }
+
+
+        // #define DWM_SIT_DISPLAYFRAME    0x00000001  // Display a window frame around the provided bitmap
+
+        [DllImport("dwmapi.dll", EntryPoint="DwmGetCompositionTimingInfo")]
+        private static extern HRESULT _DwmGetCompositionTimingInfo(IntPtr hwnd, ref DWM_TIMING_INFO pTimingInfo);
+
+        public static DWM_TIMING_INFO? DwmGetCompositionTimingInfo(IntPtr hwnd)
+        {
+            if (!Utility.IsOSVistaOrNewer)
+            {
+                // API was new to Vista.
+                return null;
+            }
+
+            var dti = new DWM_TIMING_INFO { cbSize = Marshal.SizeOf(typeof(DWM_TIMING_INFO)) };
+            HRESULT hr = _DwmGetCompositionTimingInfo(hwnd, ref dti);
+            if (hr == HRESULT.E_PENDING)
+            {
+                // The system isn't yet ready to respond.  Return null rather than throw.
+                return null;
+            }
+            hr.ThrowIfFailed();
+
+            return dti;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        public static extern void DwmInvalidateIconicBitmaps(IntPtr hwnd);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        public static extern void DwmSetIconicThumbnail(IntPtr hwnd, IntPtr hbmp, DWM_SIT dwSITFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("dwmapi.dll", PreserveSig = false)]
+        public static extern void DwmSetIconicLivePreviewBitmap(IntPtr hwnd, IntPtr hbmp, RefPOINT pptClient, DWM_SIT dwSITFlags);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll", PreserveSig = false)]
+        public static extern void SHGetItemFromDataObject(IDataObject pdtobj, DOGIF dwFlags, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.Interface)] out object ppv);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll", PreserveSig = false)]
+        public static extern HRESULT SHCreateItemFromParsingName([MarshalAs(UnmanagedType.LPWStr)] string pszPath, IBindCtx pbc, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.Interface)] out object ppv);
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool Shell_NotifyIcon(NIM dwMessage, [In] NOTIFYICONDATA lpdata);
+
+        /// <summary>
+        /// Sets the User Model AppID for the current process, enabling Windows to retrieve this ID
+        /// </summary>
+        /// <param name="AppID"></param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll", PreserveSig = false)]
+        public static extern void SetCurrentProcessExplicitAppUserModelID([MarshalAs(UnmanagedType.LPWStr)] string AppID);
+
+        /// <summary>
+        /// Retrieves the User Model AppID that has been explicitly set for the current process via SetCurrentProcessExplicitAppUserModelID
+        /// </summary>
+        /// <param name="AppID"></param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DllImport("shell32.dll")]
+        public static extern HRESULT GetCurrentProcessExplicitAppUserModelID([Out, MarshalAs(UnmanagedType.LPWStr)] out string AppID);
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
new file mode 100644
index 000000000..8a1de3172
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
@@ -0,0 +1,983 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.Runtime.InteropServices;
+    using System.Runtime.InteropServices.ComTypes;
+    using System.Text;
+
+    using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
+
+    #region Enums and Static Property Classes
+
+    /// <summary>ShellItem attribute flags.  SIATTRIBFLAGS_*</summary>
+    internal enum SIATTRIBFLAGS
+    {
+        AND = 0x00000001,
+        OR = 0x00000002,
+        APPCOMPAT = 0x00000003,
+    }
+
+    internal enum APPDOCLISTTYPE
+    {
+        ADLT_RECENT = 0,   // The recently used documents list
+        ADLT_FREQUENT,     // The frequently used documents list
+    }
+
+    /// <summary>
+    /// Flags for SetTabProperties.  STPF_*
+    /// </summary>
+    /// <remarks>The native enum was called STPFLAG.</remarks>
+    [Flags]
+    internal enum STPF
+    {
+        NONE = 0x00000000,
+        USEAPPTHUMBNAILALWAYS = 0x00000001,
+        USEAPPTHUMBNAILWHENACTIVE = 0x00000002,
+        USEAPPPEEKALWAYS = 0x00000004,
+        USEAPPPEEKWHENACTIVE = 0x00000008,
+    }
+
+    /// <summary>
+    /// Flags for Setting Taskbar Progress state.  TBPF_*
+    /// </summary>
+    /// <remarks>
+    /// The native enum was called TBPFLAG.
+    /// </remarks>
+    internal enum TBPF
+    {
+        NOPROGRESS = 0x00000000,
+        INDETERMINATE = 0x00000001,
+        NORMAL = 0x00000002,
+        ERROR = 0x00000004,
+        PAUSED = 0x00000008,
+    }
+
+    /// <summary>
+    /// THUMBBUTTON mask.  THB_*
+    /// </summary>
+    [Flags]
+    internal enum THB : uint
+    {
+        BITMAP = 0x0001,
+        ICON = 0x0002,
+        TOOLTIP = 0x0004,
+        FLAGS = 0x0008,
+    }
+
+    /// <summary>
+    /// THUMBBUTTON flags.  THBF_*
+    /// </summary>
+    [Flags]
+    internal enum THBF : uint
+    {
+        ENABLED = 0x0000,
+        DISABLED = 0x0001,
+        DISMISSONCLICK = 0x0002,
+        NOBACKGROUND = 0x0004,
+        HIDDEN = 0x0008,
+        // Added post-beta
+        NONINTERACTIVE = 0x0010,
+    }
+
+    /// <summary>
+    /// GetPropertyStoreFlags.  GPS_*.
+    /// </summary>
+    /// <remarks>
+    /// These are new for Vista, but are used in downlevel components
+    /// </remarks>
+    internal enum GPS
+    {
+        // If no flags are specified (GPS_DEFAULT), a read-only property store is returned that includes properties for the file or item.
+        // In the case that the shell item is a file, the property store contains:
+        //     1. properties about the file from the file system
+        //     2. properties from the file itself provided by the file's property handler, unless that file is offline,
+        //         see GPS_OPENSLOWITEM
+        //     3. if requested by the file's property handler and supported by the file system, properties stored in the
+        //     alternate property store.
+        //
+        // Non-file shell items should return a similar read-only store
+        //
+        // Specifying other GPS_ flags modifies the store that is returned
+        DEFAULT = 0x00000000,
+        HANDLERPROPERTIESONLY = 0x00000001,   // only include properties directly from the file's property handler
+        READWRITE = 0x00000002,   // Writable stores will only include handler properties
+        TEMPORARY = 0x00000004,   // A read/write store that only holds properties for the lifetime of the IShellItem object
+        FASTPROPERTIESONLY = 0x00000008,   // do not include any properties from the file's property handler (because the file's property handler will hit the disk)
+        OPENSLOWITEM = 0x00000010,   // include properties from a file's property handler, even if it means retrieving the file from offline storage.
+        DELAYCREATION = 0x00000020,   // delay the creation of the file's property handler until those properties are read, written, or enumerated
+        BESTEFFORT = 0x00000040,   // For readonly stores, succeed and return all available properties, even if one or more sources of properties fails. Not valid with GPS_READWRITE.
+        NO_OPLOCK = 0x00000080,   // some data sources protect the read property store with an oplock, this disables that
+        MASK_VALID = 0x000000FF,
+    }
+
+    /// <summary>
+    /// KNOWNDESTCATEGORY.  KDC_*
+    /// </summary>
+    internal enum KDC
+    {
+        FREQUENT = 1,
+        RECENT,
+    }
+
+    // IShellFolder::GetAttributesOf flags
+    [Flags]
+    internal enum SFGAO : uint
+    {
+        /// <summary>Objects can be copied</summary>
+        /// <remarks>DROPEFFECT_COPY</remarks>
+        CANCOPY = 0x1,
+        /// <summary>Objects can be moved</summary>
+        /// <remarks>DROPEFFECT_MOVE</remarks>
+        CANMOVE = 0x2,
+        /// <summary>Objects can be linked</summary>
+        /// <remarks>
+        /// DROPEFFECT_LINK.
+        /// 
+        /// If this bit is set on an item in the shell folder, a
+        /// 'Create Shortcut' menu item will be added to the File
+        /// menu and context menus for the item.  If the user selects
+        /// that command, your IContextMenu::InvokeCommand() will be called
+        /// with 'link'.
+        /// That flag will also be used to determine if 'Create Shortcut'
+        /// should be added when the item in your folder is dragged to another
+        /// folder.
+        /// </remarks>
+        CANLINK = 0x4,
+        /// <summary>supports BindToObject(IID_IStorage)</summary>
+        STORAGE = 0x00000008,
+        /// <summary>Objects can be renamed</summary>
+        CANRENAME = 0x00000010,
+        /// <summary>Objects can be deleted</summary>
+        CANDELETE = 0x00000020,
+        /// <summary>Objects have property sheets</summary>
+        HASPROPSHEET = 0x00000040,
+
+        // unused = 0x00000080,
+
+        /// <summary>Objects are drop target</summary>
+        DROPTARGET = 0x00000100,
+        CAPABILITYMASK = 0x00000177,
+        // unused = 0x00000200,
+        // unused = 0x00000400,
+        // unused = 0x00000800,
+        // unused = 0x00001000,
+        /// <summary>Object is encrypted (use alt color)</summary>
+        ENCRYPTED = 0x00002000,
+        /// <summary>'Slow' object</summary>
+        ISSLOW = 0x00004000,
+        /// <summary>Ghosted icon</summary>
+        GHOSTED = 0x00008000,
+        /// <summary>Shortcut (link)</summary>
+        LINK = 0x00010000,
+        /// <summary>Shared</summary>
+        SHARE = 0x00020000,
+        /// <summary>Read-only</summary>
+        READONLY = 0x00040000,
+        /// <summary> Hidden object</summary>
+        HIDDEN = 0x00080000,
+        DISPLAYATTRMASK = 0x000FC000,
+        /// <summary> May contain children with SFGAO_FILESYSTEM</summary>
+        FILESYSANCESTOR = 0x10000000,
+        /// <summary>Support BindToObject(IID_IShellFolder)</summary>
+        FOLDER = 0x20000000,
+        /// <summary>Is a win32 file system object (file/folder/root)</summary>
+        FILESYSTEM = 0x40000000,
+        /// <summary>May contain children with SFGAO_FOLDER (may be slow)</summary>
+        HASSUBFOLDER = 0x80000000,
+        CONTENTSMASK = 0x80000000,
+        /// <summary>Invalidate cached information (may be slow)</summary>
+        VALIDATE = 0x01000000,
+        /// <summary>Is this removeable media?</summary>
+        REMOVABLE = 0x02000000,
+        /// <summary> Object is compressed (use alt color)</summary>
+        COMPRESSED = 0x04000000,
+        /// <summary>Supports IShellFolder, but only implements CreateViewObject() (non-folder view)</summary>
+        BROWSABLE = 0x08000000,
+        /// <summary>Is a non-enumerated object (should be hidden)</summary>
+        NONENUMERATED = 0x00100000,
+        /// <summary>Should show bold in explorer tree</summary>
+        NEWCONTENT = 0x00200000,
+        /// <summary>Obsolete</summary>
+        CANMONIKER = 0x00400000,
+        /// <summary>Obsolete</summary>
+        HASSTORAGE = 0x00400000,
+        /// <summary>Supports BindToObject(IID_IStream)</summary>
+        STREAM = 0x00400000,
+        /// <summary>May contain children with SFGAO_STORAGE or SFGAO_STREAM</summary>
+        STORAGEANCESTOR = 0x00800000,
+        /// <summary>For determining storage capabilities, ie for open/save semantics</summary>
+        STORAGECAPMASK = 0x70C50008,
+        /// <summary>
+        /// Attributes that are masked out for PKEY_SFGAOFlags because they are considered
+        /// to cause slow calculations or lack context
+        /// (SFGAO_VALIDATE | SFGAO_ISSLOW | SFGAO_HASSUBFOLDER and others)
+        /// </summary>
+        PKEYSFGAOMASK = 0x81044000,
+    }
+
+    /// <summary>
+    /// IShellFolder::EnumObjects grfFlags bits.  Also called SHCONT
+    /// </summary>
+    internal enum SHCONTF
+    {
+        CHECKING_FOR_CHILDREN = 0x0010,   // hint that client is checking if (what) child items the folder contains - not all details (e.g. short file name) are needed
+        FOLDERS = 0x0020,   // only want folders enumerated (SFGAO_FOLDER)
+        NONFOLDERS = 0x0040,   // include non folders (items without SFGAO_FOLDER)
+        INCLUDEHIDDEN = 0x0080,   // show items normally hidden (items with SFGAO_HIDDEN)
+        INIT_ON_FIRST_NEXT = 0x0100,   // DEFUNCT - this is always assumed
+        NETPRINTERSRCH = 0x0200,   // hint that client is looking for printers
+        SHAREABLE = 0x0400,   // hint that client is looking sharable resources (local drives or hidden root shares)
+        STORAGE = 0x0800,   // include all items with accessible storage and their ancestors
+        NAVIGATION_ENUM = 0x1000,   // mark child folders to indicate that they should provide a "navigation" enumeration by default
+        FASTITEMS = 0x2000,   // hint that client is only interested in items that can be enumerated quickly
+        FLATLIST = 0x4000,   // enumerate items as flat list even if folder is stacked
+        ENABLE_ASYNC = 0x8000,   // inform enumerator that client is listening for change notifications so enumerator does not need to be complete, items can be reported via change notifications
+    }
+
+    /// <summary>
+    /// IShellFolder::GetDisplayNameOf/SetNameOf uFlags.  Also called SHGDNF.
+    /// </summary>
+    /// <remarks>
+    /// For compatibility with SIGDN, these bits must all sit in the LOW word.
+    /// </remarks>
+    [Flags]
+    internal enum SHGDN
+    {
+        SHGDN_NORMAL = 0x0000,  // default (display purpose)
+        SHGDN_INFOLDER = 0x0001,  // displayed under a folder (relative)
+        SHGDN_FOREDITING = 0x1000,  // for in-place editing
+        SHGDN_FORADDRESSBAR = 0x4000,  // UI friendly parsing name (remove ugly stuff)
+        SHGDN_FORPARSING = 0x8000,  // parsing name for ParseDisplayName()
+    }
+
+    /// <summary>
+    /// SHELLITEMCOMPAREHINTF.  SICHINT_*.
+    /// </summary>
+    internal enum SICHINT : uint
+    {
+        /// <summary>iOrder based on display in a folder view</summary>
+        DISPLAY = 0x00000000,
+        /// <summary>exact instance compare</summary>
+        ALLFIELDS = 0x80000000,
+        /// <summary>iOrder based on canonical name (better performance)</summary>
+        CANONICAL = 0x10000000,
+        TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000,
+    };
+
+    /// <summary>
+    /// ShellItem enum.  SIGDN_*.
+    /// </summary>
+    internal enum SIGDN : uint
+    {                                             // lower word (& with 0xFFFF)
+        NORMALDISPLAY = 0x00000000, // SHGDN_NORMAL
+        PARENTRELATIVEPARSING = 0x80018001, // SHGDN_INFOLDER | SHGDN_FORPARSING
+        DESKTOPABSOLUTEPARSING = 0x80028000, // SHGDN_FORPARSING
+        PARENTRELATIVEEDITING = 0x80031001, // SHGDN_INFOLDER | SHGDN_FOREDITING
+        DESKTOPABSOLUTEEDITING = 0x8004c000, // SHGDN_FORPARSING | SHGDN_FORADDRESSBAR
+        FILESYSPATH = 0x80058000, // SHGDN_FORPARSING
+        URL = 0x80068000, // SHGDN_FORPARSING
+        PARENTRELATIVEFORADDRESSBAR = 0x8007c001, // SHGDN_INFOLDER | SHGDN_FORPARSING | SHGDN_FORADDRESSBAR
+        PARENTRELATIVE = 0x80080001, // SHGDN_INFOLDER
+    }
+
+    /// <summary>
+    /// STR_GPS_*
+    /// </summary>
+    /// <remarks>
+    /// When requesting a property store through IShellFolder, you can specify the equivalent of
+    /// GPS_DEFAULT by passing in a null IBindCtx parameter.
+    ///
+    /// You can specify the equivalent of GPS_READWRITE by passing a mode of STGM_READWRITE | STGM_EXCLUSIVE
+    /// in the bind context
+    ///
+    /// Here are the string versions of GPS_ flags, passed to IShellFolder::BindToObject() via IBindCtx::RegisterObjectParam()
+    /// These flags are valid when requesting an IPropertySetStorage or IPropertyStore handler
+    ///
+    /// The meaning of these flags are described above.
+    ///
+    /// There is no STR_ equivalent for GPS_TEMPORARY because temporary property stores
+    /// are provided by IShellItem2 only -- not by the underlying IShellFolder.
+    /// </remarks>
+    internal static class STR_GPS
+    {
+        public const string HANDLERPROPERTIESONLY = "GPS_HANDLERPROPERTIESONLY";
+        public const string FASTPROPERTIESONLY = "GPS_FASTPROPERTIESONLY";
+        public const string OPENSLOWITEM = "GPS_OPENSLOWITEM";
+        public const string DELAYCREATION = "GPS_DELAYCREATION";
+        public const string BESTEFFORT = "GPS_BESTEFFORT";
+        public const string NO_OPLOCK = "GPS_NO_OPLOCK";
+    }
+
+    #endregion
+
+    #region Structs
+
+    [StructLayout(LayoutKind.Sequential, Pack = 8, CharSet = CharSet.Unicode)]
+    internal struct THUMBBUTTON
+    {
+        /// <summary>
+        /// WPARAM value for a THUMBBUTTON being clicked.
+        /// </summary>
+        public const int THBN_CLICKED = 0x1800;
+
+        public THB dwMask;
+        public uint iId;
+        public uint iBitmap;
+        public IntPtr hIcon;
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 260)]
+        public string szTip;
+        public THBF dwFlags;
+    }
+
+
+    [StructLayout(LayoutKind.Sequential, Pack = 4)]
+    internal struct PKEY
+    {
+        /// <summary>fmtid</summary>
+        private readonly Guid _fmtid;
+        /// <summary>pid</summary>
+        private readonly uint _pid;
+
+        public PKEY(Guid fmtid, uint pid)
+        {
+            _fmtid = fmtid;
+            _pid = pid;
+        }
+
+        /// <summary>PKEY_Title</summary>
+        public static readonly PKEY Title = new PKEY(new Guid("F29F85E0-4FF9-1068-AB91-08002B27B3D9"), 2);
+        /// <summary>PKEY_AppUserModel_ID</summary>
+        public static readonly PKEY AppUserModel_ID = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 5);
+        /// <summary>PKEY_AppUserModel_IsDestListSeparator</summary>
+        public static readonly PKEY AppUserModel_IsDestListSeparator = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 6);
+        /// <summary>PKEY_AppUserModel_RelaunchCommand</summary>
+        public static readonly PKEY AppUserModel_RelaunchCommand = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 2);
+        /// <summary>PKEY_AppUserModel_RelaunchDisplayNameResource</summary>
+        public static readonly PKEY AppUserModel_RelaunchDisplayNameResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 4);
+        /// <summary>PKEY_AppUserModel_RelaunchIconResource</summary>
+        public static readonly PKEY AppUserModel_RelaunchIconResource = new PKEY(new Guid("9F4C2855-9F79-4B39-A8D0-E1D42DE1D5F3"), 3);
+    }
+
+    #endregion
+
+    #region Interfaces
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.EnumIdList),
+    ]
+    internal interface IEnumIDList
+    {
+        [PreserveSig()]
+        HRESULT Next(uint celt, out IntPtr rgelt, out int pceltFetched);
+        [PreserveSig()]
+        HRESULT Skip(uint celt);
+        void Reset();
+        void Clone([Out, MarshalAs(UnmanagedType.Interface)] out IEnumIDList ppenum);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.EnumObjects),
+    ]
+    internal interface IEnumObjects
+    {
+        //[local]
+        // This signature might not work... Hopefully don't need this interface though.
+        void Next(uint celt, [In] ref Guid riid, [Out, MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.IUnknown, IidParameterIndex = 1, SizeParamIndex = 0)] object[] rgelt, [Out] out uint pceltFetched);
+
+        /*
+        [call_as(Next)] HRESULT RemoteNext(
+            [in] ULONG celt,
+            [in] REFIID riid,
+            [out, size_is(celt), length_is(*pceltFetched), iid_is(riid)] void **rgelt,
+            [out] ULONG *pceltFetched);
+         */
+
+        void Skip(uint celt);
+
+        void Reset();
+
+        IEnumObjects Clone();
+    }
+
+    /// <summary>Unknown Object Array</summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ObjectArray),
+    ]
+    internal interface IObjectArray
+    {
+        uint GetCount();
+        [return: MarshalAs(UnmanagedType.IUnknown)]
+        object GetAt([In] uint uiIndex, [In] ref Guid riid);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ObjectArray),
+    ]
+    interface IObjectCollection : IObjectArray
+    {
+        #region IObjectArray redeclarations
+        new uint GetCount();
+        [return: MarshalAs(UnmanagedType.IUnknown)]
+        new object GetAt([In] uint uiIndex, [In] ref Guid riid);
+        #endregion
+
+        void AddObject([MarshalAs(UnmanagedType.IUnknown)] object punk);
+        void AddFromArray(IObjectArray poaSource);
+        void RemoveObjectAt(uint uiIndex);
+        void Clear();
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.PropertyStore)
+    ]
+    internal interface IPropertyStore
+    {
+        uint GetCount();
+        PKEY GetAt(uint iProp);
+        void GetValue([In] ref PKEY pkey, [In, Out] PROPVARIANT pv);
+        void SetValue([In] ref PKEY pkey, PROPVARIANT pv);
+        void Commit();
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ShellFolder),
+    ]
+    internal interface IShellFolder
+    {
+        void ParseDisplayName(
+            [In] IntPtr hwnd,
+            [In] IBindCtx pbc,
+            [In, MarshalAs(UnmanagedType.LPWStr)] string pszDisplayName,
+            [In, Out] ref int pchEaten,
+            [Out] out IntPtr ppidl,
+            [In, Out] ref uint pdwAttributes);
+
+        IEnumIDList EnumObjects(
+            [In] IntPtr hwnd,
+            [In] SHCONTF grfFlags);
+
+        // returns an instance of a sub-folder which is specified by the IDList (pidl).
+        // IShellFolder or derived interfaces
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object BindToObject(
+            [In] IntPtr pidl,
+            [In] IBindCtx pbc,
+            [In] ref Guid riid);
+
+        // produces the same result as BindToObject()
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object BindToStorage([In] IntPtr pidl, [In] IBindCtx pbc, [In] ref Guid riid);
+
+        // compares two IDLists and returns the result. The shell
+        // explorer always passes 0 as lParam, which indicates 'sort by name'.
+        // It should return 0 (as CODE of the scode), if two id indicates the
+        // same object; negative value if pidl1 should be placed before pidl2;
+        // positive value if pidl2 should be placed before pidl1.
+        // use the macro ResultFromShort() to extract the result comparison
+        // it deals with the casting and type conversion issues for you
+        [PreserveSig]
+        HRESULT CompareIDs([In] IntPtr lParam, [In] IntPtr pidl1, [In] IntPtr pidl2);
+
+        // creates a view object of the folder itself. The view
+        // object is a difference instance from the shell folder object.
+        // 'hwndOwner' can be used  as the owner window of its dialog box or
+        // menu during the lifetime of the view object.
+        // This member function should always create a new
+        // instance which has only one reference count. The explorer may create
+        // more than one instances of view object from one shell folder object
+        // and treat them as separate instances.
+        // returns IShellView derived interface
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object CreateViewObject([In] IntPtr hwndOwner, [In] ref Guid riid);
+
+        // returns the attributes of specified objects in that
+        // folder. 'cidl' and 'apidl' specifies objects. 'apidl' contains only
+        // simple IDLists. The explorer initializes *prgfInOut with a set of
+        // flags to be evaluated. The shell folder may optimize the operation
+        // by not returning unspecified flags.
+        void GetAttributesOf(
+            [In] uint cidl,
+            [In] IntPtr apidl,
+            [In, Out] ref SFGAO rgfInOut);
+
+        // creates a UI object to be used for specified objects.
+        // The shell explorer passes either IID_IDataObject (for transfer operation)
+        // or IID_IContextMenu (for context menu operation) as riid
+        // and many other interfaces
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetUIObjectOf(
+            [In] IntPtr hwndOwner,
+            [In] uint cidl,
+            [In, MarshalAs(UnmanagedType.LPArray, ArraySubType = UnmanagedType.SysInt, SizeParamIndex = 2)] IntPtr apidl,
+            [In] ref Guid riid,
+            [In, Out] ref uint rgfReserved);
+
+        // returns the display name of the specified object.
+        // If the ID contains the display name (in the locale character set),
+        // it returns the offset to the name. Otherwise, it returns a pointer
+        // to the display name string (UNICODE), which is allocated by the
+        // task allocator, or fills in a buffer.
+        // use the helper APIS StrRetToStr() or StrRetToBuf() to deal with the different
+        // forms of the STRRET structure
+        void GetDisplayNameOf([In] IntPtr pidl, [In] SHGDN uFlags, [Out] out IntPtr pName);
+
+        // sets the display name of the specified object.
+        // If it changes the ID as well, it returns the new ID which is
+        // alocated by the task allocator.
+        void SetNameOf([In] IntPtr hwnd,
+            [In] IntPtr pidl,
+            [In, MarshalAs(UnmanagedType.LPWStr)] string pszName,
+            [In] SHGDN uFlags,
+            [Out] out IntPtr ppidlOut);
+    }
+
+    /// <summary>
+    /// Shell Namespace helper
+    /// </summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ShellItem),
+    ]
+    internal interface IShellItem
+    {
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object BindToHandler(IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
+
+        IShellItem GetParent();
+
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        string GetDisplayName(SIGDN sigdnName);
+
+        SFGAO GetAttributes(SFGAO sfgaoMask);
+
+        int Compare(IShellItem psi, SICHINT hint);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ShellItemArray),
+    ]
+    internal interface IShellItemArray
+    {
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object BindToHandler(IBindCtx pbc, [In] ref Guid rbhid, [In] ref Guid riid);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyStore(int flags, [In] ref Guid riid);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyDescriptionList([In] ref PKEY keyType, [In] ref Guid riid);
+
+        uint GetAttributes(SIATTRIBFLAGS dwAttribFlags, uint sfgaoMask);
+
+        uint GetCount();
+
+        IShellItem GetItemAt(uint dwIndex);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object EnumItems();
+    }
+
+    /// <summary>
+    /// Shell Namespace helper 2
+    /// </summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ShellItem2),
+    ]
+    interface IShellItem2 : IShellItem
+    {
+        #region IShellItem redeclarations
+        [return: MarshalAs(UnmanagedType.Interface)]
+        new object BindToHandler([In] IBindCtx pbc, [In] ref Guid bhid, [In] ref Guid riid);
+        new IShellItem GetParent();
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        new string GetDisplayName(SIGDN sigdnName);
+        new SFGAO GetAttributes(SFGAO sfgaoMask);
+        new int Compare(IShellItem psi, SICHINT hint);
+        #endregion
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyStore(
+            GPS flags,
+            [In] ref Guid riid);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyStoreWithCreateObject(
+            GPS flags,
+            [MarshalAs(UnmanagedType.IUnknown)] object punkCreateObject,   // factory for low-rights creation of type ICreateObject
+            [In] ref Guid riid);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyStoreForKeys(
+            IntPtr rgKeys,
+            uint cKeys,
+            GPS flags,
+            [In] ref Guid riid);
+
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetPropertyDescriptionList(
+            IntPtr keyType,
+            [In] ref Guid riid);
+
+        // Ensures any cached information in this item is up to date, or returns __HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) if the item does not exist.
+        void Update(IBindCtx pbc);
+
+        PROPVARIANT GetProperty(IntPtr key);
+
+        Guid GetCLSID(IntPtr key);
+
+        FILETIME GetFileTime(IntPtr key);
+
+        int GetInt32(IntPtr key);
+
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        string GetString(IntPtr key);
+
+        uint GetUInt32(IntPtr key);
+
+        ulong GetUInt64(IntPtr key);
+
+        [return: MarshalAs(UnmanagedType.Bool)]
+        void GetBool(IntPtr key);
+    }
+
+    [
+        ComImport,
+        InterfaceTypeAttribute(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ShellLink),
+    ]
+    internal interface IShellLinkW
+    {
+        void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, [In, Out] WIN32_FIND_DATAW pfd, SLGP fFlags);
+        void GetIDList(out IntPtr ppidl);
+        void SetIDList(IntPtr pidl);
+        void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxName);
+        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+        void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+        void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+        short GetHotKey();
+        void SetHotKey(short wHotKey);
+        uint GetShowCmd();
+        void SetShowCmd(uint iShowCmd);
+        void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath, int cchIconPath, out int piIcon);
+        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, uint dwReserved);
+        void Resolve(IntPtr hwnd, uint fFlags);
+        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.TaskbarList),
+    ]
+    internal interface ITaskbarList
+    {
+        /// <summary>
+        /// This function must be called first to validate use of other members.
+        /// </summary>
+        void HrInit();
+
+        /// <summary>
+        /// This function adds a tab for hwnd to the taskbar.
+        /// </summary>
+        /// <param name="hwnd">The HWND for which to add the tab.</param>
+        void AddTab(IntPtr hwnd);
+
+        /// <summary>
+        /// This function deletes a tab for hwnd from the taskbar.
+        /// </summary>
+        /// <param name="hwnd">The HWND for which the tab is to be deleted.</param>
+        void DeleteTab(IntPtr hwnd);
+
+        /// <summary>
+        /// This function activates the tab associated with hwnd on the taskbar.
+        /// </summary>
+        /// <param name="hwnd">The HWND for which the tab is to be actuvated.</param>
+        void ActivateTab(IntPtr hwnd);
+
+        /// <summary>
+        /// This function marks hwnd in the taskbar as the active tab.
+        /// </summary>
+        /// <param name="hwnd">The HWND to activate.</param>
+        void SetActiveAlt(IntPtr hwnd);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.TaskbarList2),
+    ]
+    internal interface ITaskbarList2 : ITaskbarList
+    {
+        #region ITaskbarList redeclaration
+        new void HrInit();
+        new void AddTab(IntPtr hwnd);
+        new void DeleteTab(IntPtr hwnd);
+        new void ActivateTab(IntPtr hwnd);
+        new void SetActiveAlt(IntPtr hwnd);
+        #endregion
+
+        /// <summary>
+        /// Marks a window as full-screen.
+        /// </summary>
+        /// <param name="hwnd">The handle of the window to be marked.</param>
+        /// <param name="fFullscreen">A Boolean value marking the desired full-screen status of the window.</param>
+        /// <remarks>
+        /// Setting the value of fFullscreen to true, the Shell treats this window as a full-screen window, and the taskbar
+        /// is moved to the bottom of the z-order when this window is active.  Setting the value of fFullscreen to false
+        /// removes the full-screen marking, but <i>does not</i> cause the Shell to treat the window as though it were
+        /// definitely not full-screen.  With a false fFullscreen value, the Shell depends on its automatic detection facility
+        /// to specify how the window should be treated, possibly still flagging the window as full-screen.
+        /// </remarks>
+        void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+    }
+
+    // Used to remove items from the automatic destination lists created when apps or the system call SHAddToRecentDocs to report usage of a document.
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ApplicationDestinations)
+    ]
+    internal interface IApplicationDestinations
+    {
+        // Set the App User Model ID for the application removing destinations from its list.  If an AppID is not provided 
+        // via this method, the system will use a heuristically determined ID.  This method must be called before
+        // RemoveDestination or RemoveAllDestinations.
+        void SetAppID([In, MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
+        // Remove an IShellItem or an IShellLink from the automatic destination list
+        void RemoveDestination([MarshalAs(UnmanagedType.IUnknown)] object punk);
+
+        // Clear the frequent and recent destination lists for this application.
+        void RemoveAllDestinations();
+    }
+
+    /// <summary>
+    /// Allows an application to retrieve the most recent and frequent documents opened in that app, as reported via SHAddToRecentDocs
+    /// </summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ApplicationDocumentLists)
+    ]
+    internal interface IApplicationDocumentLists
+    {
+        /// <summary>
+        /// Set the App User Model ID for the application retrieving this list.  If an AppID is not provided via this method,
+        /// the system will use a heuristically determined ID.  This method must be called before GetList. 
+        /// </summary>
+        /// <param name="pszAppID">App Id.</param>
+        void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
+        /// <summary>
+        /// Retrieve an IEnumObjects or IObjectArray for IShellItems and/or IShellLinks. 
+        /// Items may appear in both the frequent and recent lists.  
+        /// </summary>
+        /// <param name="?"></param>
+        /// <returns></returns>
+        [return: MarshalAs(UnmanagedType.IUnknown)]
+        object GetList([In] APPDOCLISTTYPE listtype, [In] uint cItemsDesired, [In] ref Guid riid);
+    }
+
+    // Custom Destination List
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.CustomDestinationList)
+    ]
+    internal interface ICustomDestinationList
+    {
+        void SetAppID([In, MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+
+        // Retrieve IObjectArray of IShellItems or IShellLinks that represent removed destinations
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object BeginList(out uint pcMaxSlots, [In] ref Guid riid);
+
+        // PreserveSig because this will return custom errors when attempting to add unregistered ShellItems.
+        // Can't readily detect that case without just trying to append it.
+        [PreserveSig]
+        HRESULT AppendCategory([MarshalAs(UnmanagedType.LPWStr)] string pszCategory, IObjectArray poa);
+        void AppendKnownCategory(KDC category);
+        [PreserveSig]
+        HRESULT AddUserTasks(IObjectArray poa);
+        void CommitList();
+
+        // Retrieve IObjectCollection of IShellItems
+        [return: MarshalAs(UnmanagedType.Interface)]
+        object GetRemovedDestinations([In] ref Guid riid);
+        void DeleteList([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+        void AbortList();
+    }
+
+    /// <summary>
+    /// Provides access to the App User Model ID on objects supporting this value.
+    /// </summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ObjectWithAppUserModelId)
+    ]
+    internal interface IObjectWithAppUserModelId
+    {
+        void SetAppID([MarshalAs(UnmanagedType.LPWStr)] string pszAppID);
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        string GetAppID();
+    };
+
+    /// <summary>
+    /// Provides access to the ProgID associated with an object 
+    /// </summary>
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.ObjectWithProgId)
+    ]
+    internal interface IObjectWithProgId
+    {
+        void SetProgID([MarshalAs(UnmanagedType.LPWStr)] string pszProgID);
+        [return: MarshalAs(UnmanagedType.LPWStr)]
+        string GetProgID();
+    };
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.TaskbarList3),
+    ]
+    internal interface ITaskbarList3 : ITaskbarList2
+    {
+        #region ITaskbarList2 redeclaration
+
+        #region ITaskbarList redeclaration
+        new void HrInit();
+        new void AddTab(IntPtr hwnd);
+        new void DeleteTab(IntPtr hwnd);
+        new void ActivateTab(IntPtr hwnd);
+        new void SetActiveAlt(IntPtr hwnd);
+        #endregion
+
+        new void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+
+        #endregion
+
+        [PreserveSig]
+        HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
+
+        [PreserveSig]
+        HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
+
+        [PreserveSig]
+        HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
+
+        [PreserveSig]
+        HRESULT UnregisterTab(IntPtr hwndTab);
+
+        [PreserveSig]
+        HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
+
+        [PreserveSig]
+        HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
+
+        [PreserveSig]
+        HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+
+        [PreserveSig]
+        HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+
+        [PreserveSig]
+        HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
+
+        [PreserveSig]
+        HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
+
+        [PreserveSig]
+        HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
+
+        // Using RefRECT to making passing NULL possible.  Removes clipping from the HWND.
+        [PreserveSig]
+        HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
+    }
+
+    [
+        ComImport,
+        InterfaceType(ComInterfaceType.InterfaceIsIUnknown),
+        Guid(IID.TaskbarList3),
+    ]
+    internal interface ITaskbarList4 : ITaskbarList3
+    {
+        #region ITaskbarList3 redeclaration
+
+        #region ITaskbarList2 redeclaration
+
+        #region ITaskbarList redeclaration
+        new void HrInit();
+        new void AddTab(IntPtr hwnd);
+        new void DeleteTab(IntPtr hwnd);
+        new void ActivateTab(IntPtr hwnd);
+        new void SetActiveAlt(IntPtr hwnd);
+        #endregion
+
+        new void MarkFullscreenWindow(IntPtr hwnd, [MarshalAs(UnmanagedType.Bool)] bool fFullscreen);
+
+        #endregion
+
+        [PreserveSig] new  HRESULT SetProgressValue(IntPtr hwnd, ulong ullCompleted, ulong ullTotal);
+        [PreserveSig] new HRESULT SetProgressState(IntPtr hwnd, TBPF tbpFlags);
+        [PreserveSig] new HRESULT RegisterTab(IntPtr hwndTab, IntPtr hwndMDI);
+        [PreserveSig] new HRESULT UnregisterTab(IntPtr hwndTab);
+        [PreserveSig] new HRESULT SetTabOrder(IntPtr hwndTab, IntPtr hwndInsertBefore);
+        [PreserveSig] new HRESULT SetTabActive(IntPtr hwndTab, IntPtr hwndMDI, uint dwReserved);
+        [PreserveSig] new HRESULT ThumbBarAddButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+        [PreserveSig] new HRESULT ThumbBarUpdateButtons(IntPtr hwnd, uint cButtons, [MarshalAs(UnmanagedType.LPArray, SizeParamIndex = 1)] THUMBBUTTON[] pButtons);
+        [PreserveSig] new HRESULT ThumbBarSetImageList(IntPtr hwnd, [MarshalAs(UnmanagedType.IUnknown)] object himl);
+        [PreserveSig] new HRESULT SetOverlayIcon(IntPtr hwnd, IntPtr hIcon, [MarshalAs(UnmanagedType.LPWStr)] string pszDescription);
+        [PreserveSig] new HRESULT SetThumbnailTooltip(IntPtr hwnd, [MarshalAs(UnmanagedType.LPWStr)] string pszTip);
+        // Using RefRECT to making passing NULL possible.  Removes clipping from the HWND.
+        [PreserveSig] new HRESULT SetThumbnailClip(IntPtr hwnd, RefRECT prcClip);
+
+        #endregion
+
+        void SetTabProperties(IntPtr hwndTab, STPF stpFlags);
+    }
+
+    #endregion
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
new file mode 100644
index 000000000..189647dff
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
@@ -0,0 +1,357 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Standard
+{
+    using System;
+    using System.Diagnostics.CodeAnalysis;
+    using System.IO;
+    using System.Runtime.InteropServices;
+    using System.Runtime.InteropServices.ComTypes;
+
+    // disambiguate with System.Runtime.InteropServices.STATSTG
+    using STATSTG = System.Runtime.InteropServices.ComTypes.STATSTG;
+
+    // All these methods return void.  Does the standard marshaller convert them to HRESULTs?
+    /// <summary>
+    /// Wraps a managed stream instance into an interface pointer consumable by COM.
+    /// </summary>
+    internal sealed class ManagedIStream : IStream, IDisposable
+    {
+        private const int STGTY_STREAM = 2;
+        private const int STGM_READWRITE = 2;
+        private const int LOCK_EXCLUSIVE = 2;
+
+        private Stream _source;
+
+        /// <summary>
+        /// Initializes a new instance of the ManagedIStream class with the specified managed Stream object.
+        /// </summary>
+        /// <param name="source">
+        /// The stream that this IStream reference is wrapping.
+        /// </param>
+        public ManagedIStream(Stream source)
+        {
+            Verify.IsNotNull(source, "source");
+            _source = source;
+        }
+
+        private void _Validate()
+        {
+            if (null == _source)
+            {
+                throw new ObjectDisposedException("this");
+            }
+        }
+
+        // Comments are taken from MSDN IStream documentation.
+        #region IStream Members
+
+        /// <summary>
+        /// Creates a new stream object with its own seek pointer that
+        /// references the same bytes as the original stream. 
+        /// </summary>
+        /// <param name="ppstm">
+        /// When this method returns, contains the new stream object. This parameter is passed uninitialized.
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::Clone in the MSDN library.
+        /// This class doesn't implement Clone.  A COMException is thrown if it is used.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+        [Obsolete("The method is not implemented", true)]
+        public void Clone(out IStream ppstm)
+        {
+            ppstm = null;
+            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+        }
+
+        /// <summary>
+        /// Ensures that any changes made to a stream object that is open in transacted
+        /// mode are reflected in the parent storage. 
+        /// </summary>
+        /// <param name="grfCommitFlags">
+        /// A value that controls how the changes for the stream object are committed. 
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::Commit in the MSDN library.
+        /// </remarks>
+        public void Commit(int grfCommitFlags)
+        {
+            _Validate();
+            _source.Flush();
+        }
+
+        /// <summary>
+        /// Copies a specified number of bytes from the current seek pointer in the
+        /// stream to the current seek pointer in another stream. 
+        /// </summary>
+        /// <param name="pstm">
+        /// A reference to the destination stream. 
+        /// </param>
+        /// <param name="cb">
+        /// The number of bytes to copy from the source stream. 
+        /// </param>
+        /// <param name="pcbRead">
+        /// On successful return, contains the actual number of bytes read from the source.
+        /// (Note the native signature is to a ULARGE_INTEGER*, so 64 bits are written
+        /// to this parameter on success.)
+        /// </param>
+        /// <param name="pcbWritten">
+        /// On successful return, contains the actual number of bytes written to the destination.
+        /// (Note the native signature is to a ULARGE_INTEGER*, so 64 bits are written
+        /// to this parameter on success.)
+        /// </param>
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public void CopyTo(IStream pstm, long cb, IntPtr pcbRead, IntPtr pcbWritten)
+        {
+            Verify.IsNotNull(pstm, "pstm");
+
+            _Validate();
+
+            // Reasonbly sized buffer, don't try to copy large streams in bulk.
+            var buffer = new byte[4096];
+            long cbWritten = 0;
+
+            while (cbWritten < cb)
+            {
+                int cbRead = _source.Read(buffer, 0, buffer.Length);
+                if (0 == cbRead)
+                {
+                    break;
+                }
+
+                // COM documentation is a bit vague here whether NULL is valid for the third parameter.
+                // Going to assume it is, as most implementations I've seen treat it as optional.
+                // It's possible this will break on some IStream implementations.
+                pstm.Write(buffer, cbRead, IntPtr.Zero);
+                cbWritten += cbRead;
+            }
+
+            if (IntPtr.Zero != pcbRead)
+            {
+                Marshal.WriteInt64(pcbRead, cbWritten);
+            }
+
+            if (IntPtr.Zero != pcbWritten)
+            {
+                Marshal.WriteInt64(pcbWritten, cbWritten);
+            }
+        }
+
+        /// <summary>
+        /// Restricts access to a specified range of bytes in the stream. 
+        /// </summary>
+        /// <param name="libOffset">
+        /// The byte offset for the beginning of the range. 
+        /// </param>
+        /// <param name="cb">
+        /// The length of the range, in bytes, to restrict.
+        /// </param>
+        /// <param name="dwLockType">
+        /// The requested restrictions on accessing the range.
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::LockRegion in the MSDN library.
+        /// This class doesn't implement LockRegion.  A COMException is thrown if it is used.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)"), Obsolete("The method is not implemented", true)]
+        public void LockRegion(long libOffset, long cb, int dwLockType)
+        {
+            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+        }
+
+        /// <summary>
+        /// Reads a specified number of bytes from the stream object into memory starting at the current seek pointer. 
+        /// </summary>
+        /// <param name="pv">
+        /// When this method returns, contains the data read from the stream. This parameter is passed uninitialized.
+        /// </param>
+        /// <param name="cb">
+        /// The number of bytes to read from the stream object. 
+        /// </param>
+        /// <param name="pcbRead">
+        /// A pointer to a ULONG variable that receives the actual number of bytes read from the stream object.
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for ISequentialStream::Read in the MSDN library.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public void Read(byte[] pv, int cb, IntPtr pcbRead)
+        {
+            _Validate();
+
+            int cbRead = _source.Read(pv, 0, cb);
+
+            if (IntPtr.Zero != pcbRead)
+            {
+                Marshal.WriteInt32(pcbRead, cbRead);
+            }
+        }
+
+
+        /// <summary>
+        /// Discards all changes that have been made to a transacted stream since the last Commit call.
+        /// </summary>
+        /// <remarks>
+        /// This class doesn't implement Revert.  A COMException is thrown if it is used.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)"), Obsolete("The method is not implemented", true)]
+        public void Revert()
+        {
+            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+        }
+
+        /// <summary>
+        /// Changes the seek pointer to a new location relative to the beginning of the
+        /// stream, to the end of the stream, or to the current seek pointer.
+        /// </summary>
+        /// <param name="dlibMove">
+        /// The displacement to add to dwOrigin.
+        /// </param>
+        /// <param name="dwOrigin">
+        /// The origin of the seek. The origin can be the beginning of the file, the current seek pointer, or the end of the file. 
+        /// </param>
+        /// <param name="plibNewPosition">
+        /// On successful return, contains the offset of the seek pointer from the beginning of the stream.
+        /// (Note the native signature is to a ULARGE_INTEGER*, so 64 bits are written
+        /// to this parameter on success.)
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::Seek in the MSDN library.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public void Seek(long dlibMove, int dwOrigin, IntPtr plibNewPosition)
+        {
+            _Validate();
+
+            long position = _source.Seek(dlibMove, (SeekOrigin)dwOrigin);
+
+            if (IntPtr.Zero != plibNewPosition)
+            {
+                Marshal.WriteInt64(plibNewPosition, position);
+            }
+        }
+
+        /// <summary>
+        /// Changes the size of the stream object. 
+        /// </summary>
+        /// <param name="libNewSize">
+        /// The new size of the stream as a number of bytes. 
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::SetSize in the MSDN library.
+        /// </remarks>
+        public void SetSize(long libNewSize)
+        {
+            _Validate();
+            _source.SetLength(libNewSize);
+        }
+
+        /// <summary>
+        /// Retrieves the STATSTG structure for this stream. 
+        /// </summary>
+        /// <param name="pstatstg">
+        /// When this method returns, contains a STATSTG structure that describes this stream object.
+        /// This parameter is passed uninitialized.
+        /// </param>
+        /// <param name="grfStatFlag">
+        /// Members in the STATSTG structure that this method does not return, thus saving some memory allocation operations. 
+        /// </param>
+        public void Stat(out STATSTG pstatstg, int grfStatFlag)
+        {
+            pstatstg = default(STATSTG);
+            _Validate();
+
+            pstatstg.type = STGTY_STREAM;
+            pstatstg.cbSize = _source.Length;
+            pstatstg.grfMode = STGM_READWRITE;
+            pstatstg.grfLocksSupported = LOCK_EXCLUSIVE;
+        }
+
+        /// <summary>
+        /// Removes the access restriction on a range of bytes previously restricted with the LockRegion method.
+        /// </summary>
+        /// <param name="libOffset">The byte offset for the beginning of the range.
+        /// </param>
+        /// <param name="cb">
+        /// The length, in bytes, of the range to restrict.
+        /// </param>
+        /// <param name="dwLockType">
+        /// The access restrictions previously placed on the range.
+        /// </param>
+        /// <remarks>
+        /// For more information, see the existing documentation for IStream::UnlockRegion in the MSDN library.
+        /// This class doesn't implement UnlockRegion.  A COMException is thrown if it is used.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Globalization", "CA1303:Do not pass literals as localized parameters", MessageId = "Standard.HRESULT.ThrowIfFailed(System.String)")]
+        [Obsolete("The method is not implemented", true)]
+        public void UnlockRegion(long libOffset, long cb, int dwLockType)
+        {
+            HRESULT.STG_E_INVALIDFUNCTION.ThrowIfFailed("The method is not implemented.");
+        }
+
+        /// <summary>
+        /// Writes a specified number of bytes into the stream object starting at the current seek pointer.
+        /// </summary>
+        /// <param name="pv">
+        /// The buffer to write this stream to.
+        /// </param>
+        /// <param name="cb">
+        /// The number of bytes to write to the stream. 
+        /// </param>
+        /// <param name="pcbWritten">
+        /// On successful return, contains the actual number of bytes written to the stream object. 
+        /// If the caller sets this pointer to null, this method does not provide the actual number
+        /// of bytes written.
+        /// </param>
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public void Write(byte[] pv, int cb, IntPtr pcbWritten)
+        {
+            _Validate();
+
+            _source.Write(pv, 0, cb);
+
+            if (IntPtr.Zero != pcbWritten)
+            {
+                Marshal.WriteInt32(pcbWritten, cb);
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        /// <summary>
+        /// Releases resources controlled by this object.
+        /// </summary>
+        /// <remarks>
+        /// Dispose can be called multiple times, but trying to use the object
+        /// after it has been disposed will generally throw ObjectDisposedExceptions.
+        /// </remarks>
+        public void Dispose()
+        {
+            _source = null;
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
new file mode 100644
index 000000000..0460fa8a2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
@@ -0,0 +1,1053 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+// This file contains general utilities to aid in development.
+// Classes here generally shouldn't be exposed publicly since
+// they're not particular to any library functionality.
+// Because the classes here are internal, it's likely this file
+// might be included in multiple assemblies.
+namespace Standard
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.IO;
+    using System.Reflection;
+    using System.Runtime.InteropServices;
+    using System.Security.Cryptography;
+    using System.Text;
+    using System.Windows;
+    using System.Windows.Media;
+    using System.Windows.Media.Imaging;
+
+    internal static partial class Utility
+    {
+        private static readonly Version _osVersion = Environment.OSVersion.Version;
+        private static readonly Version _presentationFrameworkVersion = Assembly.GetAssembly(typeof(Window)).GetName().Version;
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static bool _MemCmp(IntPtr left, IntPtr right, long cb)
+        {
+            int offset = 0;
+
+            for (; offset < (cb - sizeof(Int64)); offset += sizeof(Int64))
+            {
+                Int64 left64 = Marshal.ReadInt64(left, offset);
+                Int64 right64 = Marshal.ReadInt64(right, offset);
+
+                if (left64 != right64)
+                {
+                    return false;
+                }
+            }
+
+            for (; offset < cb; offset += sizeof(byte))
+            {
+                byte left8 = Marshal.ReadByte(left, offset);
+                byte right8 = Marshal.ReadByte(right, offset);
+
+                if (left8 != right8)
+                {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>The native RGB macro.</summary>
+        /// <param name="c"></param>
+        /// <returns></returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int RGB(Color c)
+        {
+            return c.R | (c.G << 8) | (c.B << 16);
+        }
+
+        /// <summary>Convert a native integer that represent a color with an alpha channel into a Color struct.</summary>
+        /// <param name="color">The integer that represents the color.  Its bits are of the format 0xAARRGGBB.</param>
+        /// <returns>A Color representation of the parameter.</returns>
+        public static Color ColorFromArgbDword(uint color)
+        {
+            return Color.FromArgb(
+                (byte)((color & 0xFF000000) >> 24),
+                (byte)((color & 0x00FF0000) >> 16),
+                (byte)((color & 0x0000FF00) >> 8),
+                (byte)((color & 0x000000FF) >> 0));
+        }
+
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int GET_X_LPARAM(IntPtr lParam)
+        {
+            return LOWORD(lParam.ToInt32());
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int GET_Y_LPARAM(IntPtr lParam)
+        {
+            return HIWORD(lParam.ToInt32());
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int HIWORD(int i)
+        {
+            return (short)(i >> 16);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static int LOWORD(int i)
+        {
+            return (short)(i & 0xFFFF);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static bool AreStreamsEqual(Stream left, Stream right)
+        {
+            if (null == left)
+            {
+                return right == null;
+            }
+            if (null == right)
+            {
+                return false;
+            }
+
+            if (!left.CanRead || !right.CanRead)
+            {
+                throw new NotSupportedException("The streams can't be read for comparison");
+            }
+
+            if (left.Length != right.Length)
+            {
+                return false;
+            }
+
+            var length = (int)left.Length;
+
+            // seek to beginning
+            left.Position = 0;
+            right.Position = 0;
+
+            // total bytes read
+            int totalReadLeft = 0;
+            int totalReadRight = 0;
+
+            // bytes read on this iteration
+            int cbReadLeft = 0;
+            int cbReadRight = 0;
+
+            // where to store the read data
+            var leftBuffer = new byte[512];
+            var rightBuffer = new byte[512];
+
+            // pin the left buffer
+            GCHandle handleLeft = GCHandle.Alloc(leftBuffer, GCHandleType.Pinned);
+            IntPtr ptrLeft = handleLeft.AddrOfPinnedObject();
+
+            // pin the right buffer
+            GCHandle handleRight = GCHandle.Alloc(rightBuffer, GCHandleType.Pinned);
+            IntPtr ptrRight = handleRight.AddrOfPinnedObject();
+
+            try
+            {
+                while (totalReadLeft < length)
+                {
+                    Assert.AreEqual(totalReadLeft, totalReadRight);
+
+                    cbReadLeft = left.Read(leftBuffer, 0, leftBuffer.Length);
+                    cbReadRight = right.Read(rightBuffer, 0, rightBuffer.Length);
+
+                    // verify the contents are an exact match
+                    if (cbReadLeft != cbReadRight)
+                    {
+                        return false;
+                    }
+
+                    if (!_MemCmp(ptrLeft, ptrRight, cbReadLeft))
+                    {
+                        return false;
+                    }
+
+                    totalReadLeft += cbReadLeft;
+                    totalReadRight += cbReadRight;
+                }
+
+                Assert.AreEqual(cbReadLeft, cbReadRight);
+                Assert.AreEqual(totalReadLeft, totalReadRight);
+                Assert.AreEqual(length, totalReadLeft);
+
+                return true;
+            }
+            finally
+            {
+                handleLeft.Free();
+                handleRight.Free();
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool GuidTryParse(string guidString, out Guid guid)
+        {
+            Verify.IsNeitherNullNorEmpty(guidString, "guidString");
+
+            try
+            {
+                guid = new Guid(guidString);
+                return true;
+            }
+            catch (FormatException)
+            {
+            }
+            catch (OverflowException)
+            {
+            }
+            // Doesn't seem to be a valid guid.
+            guid = default(Guid);
+            return false;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsFlagSet(int value, int mask)
+        {
+            return 0 != (value & mask);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsFlagSet(uint value, uint mask)
+        {
+            return 0 != (value & mask);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsFlagSet(long value, long mask)
+        {
+            return 0 != (value & mask);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsFlagSet(ulong value, ulong mask)
+        {
+            return 0 != (value & mask);
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsOSVistaOrNewer
+        {
+            get { return _osVersion >= new Version(6, 0); }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool IsOSWindows7OrNewer
+        {
+            get { return _osVersion >= new Version(6, 1); }
+        }
+
+        /// <summary>
+        /// Is this using WPF4?
+        /// </summary>
+        /// <remarks>
+        /// There are a few specific bugs in Window in 3.5SP1 and below that require workarounds
+        /// when handling WM_NCCALCSIZE on the HWND.
+        /// </remarks>
+        public static bool IsPresentationFrameworkVersionLessThan4
+        {
+            get { return _presentationFrameworkVersion < new Version(4, 0); }
+        }
+
+        // Caller is responsible for destroying the HICON
+        // Caller is responsible to ensure that GDI+ has been initialized.
+        [SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static IntPtr GenerateHICON(ImageSource image, Size dimensions)
+        {
+            if (image == null)
+            {
+                return IntPtr.Zero;
+            }
+
+            // If we're getting this from a ".ico" resource, then it comes through as a BitmapFrame.
+            // We can use leverage this as a shortcut to get the right 16x16 representation
+            // because DrawImage doesn't do that for us.
+            var bf = image as BitmapFrame;
+            if (bf != null)
+            {
+                bf = GetBestMatch(bf.Decoder.Frames, (int)dimensions.Width, (int)dimensions.Height);
+            }
+            else
+            {
+                // Constrain the dimensions based on the aspect ratio.
+                var drawingDimensions = new Rect(0, 0, dimensions.Width, dimensions.Height);
+
+                // There's no reason to assume that the requested image dimensions are square.
+                double renderRatio = dimensions.Width / dimensions.Height;
+                double aspectRatio = image.Width / image.Height;
+
+                // If it's smaller than the requested size, then place it in the middle and pad the image.
+                if (image.Width <= dimensions.Width && image.Height <= dimensions.Height)
+                {
+                    drawingDimensions = new Rect((dimensions.Width - image.Width) / 2, (dimensions.Height - image.Height) / 2, image.Width, image.Height);
+                }
+                else if (renderRatio > aspectRatio)
+                {
+                    double scaledRenderWidth = (image.Width / image.Height) * dimensions.Width;
+                    drawingDimensions = new Rect((dimensions.Width - scaledRenderWidth) / 2, 0, scaledRenderWidth, dimensions.Height);
+                }
+                else if (renderRatio < aspectRatio)
+                {
+                    double scaledRenderHeight = (image.Height / image.Width) * dimensions.Height;
+                    drawingDimensions = new Rect(0, (dimensions.Height - scaledRenderHeight) / 2, dimensions.Width, scaledRenderHeight);
+                }
+
+                var dv = new DrawingVisual();
+                DrawingContext dc = dv.RenderOpen();
+                dc.DrawImage(image, drawingDimensions);
+                dc.Close();
+
+                var bmp = new RenderTargetBitmap((int)dimensions.Width, (int)dimensions.Height, 96, 96, PixelFormats.Pbgra32);
+                bmp.Render(dv);
+                bf = BitmapFrame.Create(bmp);
+            }
+
+            // Using GDI+ to convert to an HICON.
+            // I'd rather not duplicate their code.
+            using (MemoryStream memstm = new MemoryStream())
+            {
+                BitmapEncoder enc = new PngBitmapEncoder();
+                enc.Frames.Add(bf);
+                enc.Save(memstm);
+
+                using (var istm = new ManagedIStream(memstm))
+                {
+                    // We are not bubbling out GDI+ errors when creating the native image fails.
+                    IntPtr bitmap = IntPtr.Zero;
+                    try
+                    {
+                        Status gpStatus = NativeMethods.GdipCreateBitmapFromStream(istm, out bitmap);
+                        if (Status.Ok != gpStatus)
+                        {
+                            return IntPtr.Zero;
+                        }
+
+                        IntPtr hicon;
+                        gpStatus = NativeMethods.GdipCreateHICONFromBitmap(bitmap, out hicon);
+                        if (Status.Ok != gpStatus)
+                        {
+                            return IntPtr.Zero;
+                        }
+
+                        // Caller is responsible for freeing this.
+                        return hicon;
+                    }
+                    finally
+                    {
+                        Utility.SafeDisposeImage(ref bitmap);
+                    }
+                }
+            }
+        }
+
+        public static BitmapFrame GetBestMatch(IList<BitmapFrame> frames, int width, int height)
+        {
+            return _GetBestMatch(frames, _GetBitDepth(), width, height);
+        }
+
+        private static int _MatchImage(BitmapFrame frame, int bitDepth, int width, int height, int bpp)
+        {
+            int score = 2 * _WeightedAbs(bpp, bitDepth, false) +
+                    _WeightedAbs(frame.PixelWidth, width, true) +
+                    _WeightedAbs(frame.PixelHeight, height, true);
+
+            return score;
+        }
+
+        private static int _WeightedAbs(int valueHave, int valueWant, bool fPunish)
+        {
+            int diff = (valueHave - valueWant);
+
+            if (diff < 0)
+            {
+                diff = (fPunish ? -2 : -1) * diff;
+            }
+
+            return diff;
+        }
+
+        /// From a list of BitmapFrames find the one that best matches the requested dimensions.
+        /// The methods used here are copied from Win32 sources.  We want to be consistent with
+        /// system behaviors.
+        private static BitmapFrame _GetBestMatch(IList<BitmapFrame> frames, int bitDepth, int width, int height)
+        {
+            int bestScore = int.MaxValue;
+            int bestBpp = 0;
+            int bestIndex = 0;
+
+            bool isBitmapIconDecoder = frames[0].Decoder is IconBitmapDecoder;
+
+            for (int i = 0; i < frames.Count && bestScore != 0; ++i)
+            {
+                int currentIconBitDepth = isBitmapIconDecoder ? frames[i].Thumbnail.Format.BitsPerPixel : frames[i].Format.BitsPerPixel;
+
+                if (currentIconBitDepth == 0)
+                {
+                    currentIconBitDepth = 8;
+                }
+
+                int score = _MatchImage(frames[i], bitDepth, width, height, currentIconBitDepth);
+                if (score < bestScore)
+                {
+                    bestIndex = i;
+                    bestBpp = currentIconBitDepth;
+                    bestScore = score;
+                }
+                else if (score == bestScore)
+                {
+                    // Tie breaker: choose the higher color depth.  If that fails, choose first one.
+                    if (bestBpp < currentIconBitDepth)
+                    {
+                        bestIndex = i;
+                        bestBpp = currentIconBitDepth;
+                    }
+                }
+            }
+
+            return frames[bestIndex];
+        }
+
+        // This can be cached.  It's not going to change under reasonable circumstances.
+        private static int s_bitDepth; // = 0;
+        private static int _GetBitDepth()
+        {
+            if (s_bitDepth == 0)
+            {
+                using (SafeDC dc = SafeDC.GetDesktop())
+                {
+                    s_bitDepth = NativeMethods.GetDeviceCaps(dc, DeviceCap.BITSPIXEL) * NativeMethods.GetDeviceCaps(dc, DeviceCap.PLANES);
+                }
+            }
+            return s_bitDepth;
+        }
+
+        /// <summary>
+        /// Simple guard against the exceptions that File.Delete throws on null and empty strings.
+        /// </summary>
+        /// <param name="path">The path to delete.  Unlike File.Delete, this can be null or empty.</param>
+        /// <remarks>
+        /// Note that File.Delete, and by extension SafeDeleteFile, does not throw an exception
+        /// if the file does not exist.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDeleteFile(string path)
+        {
+            if (!string.IsNullOrEmpty(path))
+            {
+
+                File.Delete(path);
+            }
+        }
+
+        /// <summary>GDI's DeleteObject</summary>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDeleteObject(ref IntPtr gdiObject)
+        {
+            IntPtr p = gdiObject;
+            gdiObject = IntPtr.Zero;
+            if (IntPtr.Zero != p)
+            {
+                NativeMethods.DeleteObject(p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDestroyIcon(ref IntPtr hicon)
+        {
+            IntPtr p = hicon;
+            hicon = IntPtr.Zero;
+            if (IntPtr.Zero != p)
+            {
+                NativeMethods.DestroyIcon(p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDestroyWindow(ref IntPtr hwnd)
+        {
+            IntPtr p = hwnd;
+            hwnd = IntPtr.Zero;
+            if (NativeMethods.IsWindow(p))
+            {
+                NativeMethods.DestroyWindow(p);
+            }
+        }
+
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDispose<T>(ref T disposable) where T : IDisposable
+        {
+            // Dispose can safely be called on an object multiple times.
+            IDisposable t = disposable;
+            disposable = default(T);
+            if (null != t)
+            {
+                t.Dispose();
+            }
+        }
+
+        /// <summary>GDI+'s DisposeImage</summary>
+        /// <param name="gdipImage"></param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void SafeDisposeImage(ref IntPtr gdipImage)
+        {
+            IntPtr p = gdipImage;
+            gdipImage = IntPtr.Zero;
+            if (IntPtr.Zero != p)
+            {
+                NativeMethods.GdipDisposeImage(p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static void SafeCoTaskMemFree(ref IntPtr ptr)
+        {
+            IntPtr p = ptr;
+            ptr = IntPtr.Zero;
+            if (IntPtr.Zero != p)
+            {
+                Marshal.FreeCoTaskMem(p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static void SafeFreeHGlobal(ref IntPtr hglobal)
+        {
+            IntPtr p = hglobal;
+            hglobal = IntPtr.Zero;
+            if (IntPtr.Zero != p)
+            {
+                Marshal.FreeHGlobal(p);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        public static void SafeRelease<T>(ref T comObject) where T : class
+        {
+            T t = comObject;
+            comObject = default(T);
+            if (null != t)
+            {
+                Assert.IsTrue(Marshal.IsComObject(t));
+                Marshal.ReleaseComObject(t);
+            }
+        }
+
+        /// <summary>
+        /// Utility to help classes catenate their properties for implementing ToString().
+        /// </summary>
+        /// <param name="source">The StringBuilder to catenate the results into.</param>
+        /// <param name="propertyName">The name of the property to be catenated.</param>
+        /// <param name="value">The value of the property to be catenated.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void GeneratePropertyString(StringBuilder source, string propertyName, string value)
+        {
+            Assert.IsNotNull(source);
+            Assert.IsFalse(string.IsNullOrEmpty(propertyName));
+
+            if (0 != source.Length)
+            {
+                source.Append(' ');
+            }
+
+            source.Append(propertyName);
+            source.Append(": ");
+            if (string.IsNullOrEmpty(value))
+            {
+                source.Append("<null>");
+            }
+            else
+            {
+                source.Append('\"');
+                source.Append(value);
+                source.Append('\"');
+            }
+        }
+
+        /// <summary>
+        /// Generates ToString functionality for a struct.  This is an expensive way to do it,
+        /// it exists for the sake of debugging while classes are in flux.
+        /// Eventually this should just be removed and the classes should
+        /// do this without reflection.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="object"></param>
+        /// <returns></returns>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [Obsolete]
+        public static string GenerateToString<T>(T @object) where T : struct
+        {
+            var sbRet = new StringBuilder();
+            foreach (PropertyInfo property in typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance))
+            {
+                if (0 != sbRet.Length)
+                {
+                    sbRet.Append(", ");
+                }
+                Assert.AreEqual(0, property.GetIndexParameters().Length);
+                object value = property.GetValue(@object, null);
+                string format = null == value ? "{0}: <null>" : "{0}: \"{1}\"";
+                sbRet.AppendFormat(format, property.Name, value);
+            }
+            return sbRet.ToString();
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void CopyStream(Stream destination, Stream source)
+        {
+            Assert.IsNotNull(source);
+            Assert.IsNotNull(destination);
+
+            destination.Position = 0;
+
+            // If we're copying from, say, a web stream, don't fail because of this.
+            if (source.CanSeek)
+            {
+                source.Position = 0;
+
+                // Consider that this could throw because 
+                // the source stream doesn't know it's size...
+                destination.SetLength(source.Length);
+            }
+
+            var buffer = new byte[4096];
+            int cbRead;
+
+            do
+            {
+                cbRead = source.Read(buffer, 0, buffer.Length);
+                if (0 != cbRead)
+                {
+                    destination.Write(buffer, 0, cbRead);
+                }
+            }
+            while (buffer.Length == cbRead);
+
+            // Reset the Seek pointer before returning.
+            destination.Position = 0;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static string HashStreamMD5(Stream stm)
+        {
+            stm.Position = 0;
+            var hashBuilder = new StringBuilder();
+            using (MD5 md5 = MD5.Create())
+            {
+                foreach (byte b in md5.ComputeHash(stm))
+                {
+                    hashBuilder.Append(b.ToString("x2", CultureInfo.InvariantCulture));
+                }
+            }
+
+            return hashBuilder.ToString();
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static void EnsureDirectory(string path)
+        {
+            if (!Directory.Exists(Path.GetDirectoryName(path)))
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(path));
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static bool MemCmp(byte[] left, byte[] right, int cb)
+        {
+            Assert.IsNotNull(left);
+            Assert.IsNotNull(right);
+
+            Assert.IsTrue(cb <= Math.Min(left.Length, right.Length));
+
+            // pin this buffer
+            GCHandle handleLeft = GCHandle.Alloc(left, GCHandleType.Pinned);
+            IntPtr ptrLeft = handleLeft.AddrOfPinnedObject();
+
+            // pin the other buffer
+            GCHandle handleRight = GCHandle.Alloc(right, GCHandleType.Pinned);
+            IntPtr ptrRight = handleRight.AddrOfPinnedObject();
+
+            bool fRet = _MemCmp(ptrLeft, ptrRight, cb);
+
+            handleLeft.Free();
+            handleRight.Free();
+
+            return fRet;
+        }
+
+        private class _UrlDecoder
+        {
+            private readonly Encoding _encoding;
+            private readonly char[] _charBuffer;
+            private readonly byte[] _byteBuffer;
+            private int _byteCount;
+            private int _charCount;
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            public _UrlDecoder(int size, Encoding encoding)
+            {
+                _encoding = encoding;
+                _charBuffer = new char[size];
+                _byteBuffer = new byte[size];
+            }
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            public void AddByte(byte b)
+            {
+                _byteBuffer[_byteCount++] = b;
+            }
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            public void AddChar(char ch)
+            {
+                _FlushBytes();
+                _charBuffer[_charCount++] = ch;
+            }
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            private void _FlushBytes()
+            {
+                if (_byteCount > 0)
+                {
+                    _charCount += _encoding.GetChars(_byteBuffer, 0, _byteCount, _charBuffer, _charCount);
+                    _byteCount = 0;
+                }
+            }
+
+            [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+            public string GetString()
+            {
+                _FlushBytes();
+                if (_charCount > 0)
+                {
+                    return new string(_charBuffer, 0, _charCount);
+                }
+                return "";
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static string UrlDecode(string url)
+        {
+            if (url == null)
+            {
+                return null;
+            }
+
+            var decoder = new _UrlDecoder(url.Length, Encoding.UTF8);
+            int length = url.Length;
+            for (int i = 0; i < length; ++i)
+            {
+                char ch = url[i];
+
+                if (ch == '+')
+                {
+                    decoder.AddByte((byte)' ');
+                    continue;
+                }
+
+                if (ch == '%' && i < length - 2)
+                {
+                    // decode %uXXXX into a Unicode character.
+                    if (url[i + 1] == 'u' && i < length - 5)
+                    {
+                        int a = _HexToInt(url[i + 2]);
+                        int b = _HexToInt(url[i + 3]);
+                        int c = _HexToInt(url[i + 4]);
+                        int d = _HexToInt(url[i + 5]);
+                        if (a >= 0 && b >= 0 && c >= 0 && d >= 0)
+                        {
+                            decoder.AddChar((char)((a << 12) | (b << 8) | (c << 4) | d));
+                            i += 5;
+
+                            continue;
+                        }
+                    }
+                    else
+                    {
+                        // decode %XX into a Unicode character.
+                        int a = _HexToInt(url[i + 1]);
+                        int b = _HexToInt(url[i + 2]);
+
+                        if (a >= 0 && b >= 0)
+                        {
+                            decoder.AddByte((byte)((a << 4) | b));
+                            i += 2;
+
+                            continue;
+                        }
+                    }
+                }
+
+                // Add any 7bit character as a byte.
+                if ((ch & 0xFF80) == 0)
+                {
+                    decoder.AddByte((byte)ch);
+                }
+                else
+                {
+                    decoder.AddChar(ch);
+                }
+            }
+
+            return decoder.GetString();
+        }
+
+        /// <summary>
+        /// Encodes a URL string.  Duplicated functionality from System.Web.HttpUtility.UrlEncode.
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// Duplicated from System.Web.HttpUtility because System.Web isn't part of the client profile.
+        /// URL Encoding replaces ' ' with '+' and unsafe ASCII characters with '%XX'.
+        /// Safe characters are defined in RFC2396 (http://www.ietf.org/rfc/rfc2396.txt).
+        /// They are the 7-bit ASCII alphanumerics and the mark characters "-_.!~*'()".
+        /// This implementation does not treat '~' as a safe character to be consistent with the System.Web version.
+        /// </remarks>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        public static string UrlEncode(string url)
+        {
+            if (url == null)
+            {
+                return null;
+            }
+
+            byte[] bytes = Encoding.UTF8.GetBytes(url);
+
+            bool needsEncoding = false;
+            int unsafeCharCount = 0;
+            foreach (byte b in bytes)
+            {
+                if (b == ' ')
+                {
+                    needsEncoding = true;
+                }
+                else if (!_UrlEncodeIsSafe(b))
+                {
+                    ++unsafeCharCount;
+                    needsEncoding = true;
+                }
+            }
+
+            if (needsEncoding)
+            {
+                var buffer = new byte[bytes.Length + (unsafeCharCount * 2)];
+                int writeIndex = 0;
+                foreach (byte b in bytes)
+                {
+                    if (_UrlEncodeIsSafe(b))
+                    {
+                        buffer[writeIndex++] = b;
+                    }
+                    else if (b == ' ')
+                    {
+                        buffer[writeIndex++] = (byte)'+';
+                    }
+                    else
+                    {
+                        buffer[writeIndex++] = (byte)'%';
+                        buffer[writeIndex++] = _IntToHex((b >> 4) & 0xF);
+                        buffer[writeIndex++] = _IntToHex(b & 0xF);
+                    }
+                }
+                bytes = buffer;
+                Assert.AreEqual(buffer.Length, writeIndex);
+            }
+
+            return Encoding.ASCII.GetString(bytes);
+        }
+
+        // HttpUtility's UrlEncode is slightly different from the RFC.
+        // RFC2396 describes unreserved characters as alphanumeric or
+        // the list "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
+        // The System.Web version unnecessarily escapes '~', which should be okay...
+        // Keeping that same pattern here just to be consistent.
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static bool _UrlEncodeIsSafe(byte b)
+        {
+            if (_IsAsciiAlphaNumeric(b))
+            {
+                return true;
+            }
+
+            switch ((char)b)
+            {
+                case '-':
+                case '_':
+                case '.':
+                case '!':
+                //case '~':
+                case '*':
+                case '\'':
+                case '(':
+                case ')':
+                    return true;
+            }
+
+            return false;
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static bool _IsAsciiAlphaNumeric(byte b)
+        {
+            return (b >= 'a' && b <= 'z')
+                || (b >= 'A' && b <= 'Z')
+                || (b >= '0' && b <= '9');
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static byte _IntToHex(int n)
+        {
+            Assert.BoundedInteger(0, n, 16);
+            if (n <= 9)
+            {
+                return (byte)(n + '0');
+            }
+            return (byte)(n - 10 + 'A');
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        private static int _HexToInt(char h)
+        {
+            if (h >= '0' && h <= '9')
+            {
+                return h - '0';
+            }
+
+            if (h >= 'a' && h <= 'f')
+            {
+                return h - 'a' + 10;
+            }
+
+            if (h >= 'A' && h <= 'F')
+            {
+                return h - 'A' + 10;
+            }
+
+            Assert.Fail("Invalid hex character " + h);
+            return -1;
+        }
+
+        public static void AddDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
+        {
+            if (component == null)
+            {
+                return;
+            }
+            Assert.IsNotNull(property);
+            Assert.IsNotNull(listener);
+
+            DependencyPropertyDescriptor dpd = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
+            dpd.AddValueChanged(component, listener);
+        }
+
+        public static void RemoveDependencyPropertyChangeListener(object component, DependencyProperty property, EventHandler listener)
+        {
+            if (component == null)
+            {
+                return;
+            }
+            Assert.IsNotNull(property);
+            Assert.IsNotNull(listener);
+
+            DependencyPropertyDescriptor dpd = DependencyPropertyDescriptor.FromProperty(property, component.GetType());
+            dpd.RemoveValueChanged(component, listener);
+        }
+
+        #region Extension Methods
+
+        public static bool IsThicknessNonNegative(Thickness thickness)
+        {
+            if (!IsDoubleFiniteAndNonNegative(thickness.Top))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(thickness.Left))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(thickness.Bottom))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(thickness.Right))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool IsCornerRadiusValid(CornerRadius cornerRadius)
+        {
+            if (!IsDoubleFiniteAndNonNegative(cornerRadius.TopLeft))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(cornerRadius.TopRight))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(cornerRadius.BottomLeft))
+            {
+                return false;
+            }
+
+            if (!IsDoubleFiniteAndNonNegative(cornerRadius.BottomRight))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        public static bool IsDoubleFiniteAndNonNegative(double d)
+        {
+            if (double.IsNaN(d) || double.IsInfinity(d) || d < 0)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
new file mode 100644
index 000000000..ea8f3bcce
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
@@ -0,0 +1,328 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+// This file contains general utilities to aid in development.
+// Classes here generally shouldn't be exposed publicly since
+// they're not particular to any library functionality.
+// Because the classes here are internal, it's likely this file
+// might be included in multiple assemblies.
+namespace Standard
+{
+    using System;
+    using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Globalization;
+    using System.IO;
+    using System.Threading;
+
+    /// <summary>
+    /// A static class for retail validated assertions.
+    /// Instead of breaking into the debugger an exception is thrown.
+    /// </summary>
+    internal static class Verify
+    {
+        /// <summary>
+        /// Ensure that the current thread's apartment state is what's expected.
+        /// </summary>
+        /// <param name="requiredState">
+        /// The required apartment state for the current thread.
+        /// </param>
+        /// <param name="message">
+        /// The message string for the exception to be thrown if the state is invalid.
+        /// </param>
+        /// <exception cref="InvalidOperationException">
+        /// Thrown if the calling thread's apartment state is not the same as the requiredState.
+        /// </exception>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsApartmentState(ApartmentState requiredState, string message)
+        {
+            if (Thread.CurrentThread.GetApartmentState() != requiredState)
+            {
+                throw new InvalidOperationException(message);
+            }
+        }
+
+        /// <summary>
+        /// Ensure that an argument is neither null nor empty.
+        /// </summary>
+        /// <param name="value">The string to validate.</param>
+        /// <param name="name">The name of the parameter that will be presented if an exception is thrown.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
+        [DebuggerStepThrough]
+        public static void IsNeitherNullNorEmpty(string value, string name)
+        {
+            // catch caller errors, mixing up the parameters.  Name should never be empty.
+            Assert.IsNeitherNullNorEmpty(name);
+
+            // Notice that ArgumentNullException and ArgumentException take the parameters in opposite order :P
+            const string errorMessage = "The parameter can not be either null or empty.";
+            if (null == value)
+            {
+                throw new ArgumentNullException(name, errorMessage);
+            }
+            if ("" == value)
+            {
+                throw new ArgumentException(errorMessage, name);
+            }
+        }
+
+        /// <summary>
+        /// Ensure that an argument is neither null nor does it consist only of whitespace.
+        /// </summary>
+        /// <param name="value">The string to validate.</param>
+        /// <param name="name">The name of the parameter that will be presented if an exception is thrown.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")]
+        [DebuggerStepThrough]
+        public static void IsNeitherNullNorWhitespace(string value, string name)
+        {
+            // catch caller errors, mixing up the parameters.  Name should never be empty.
+            Assert.IsNeitherNullNorEmpty(name);
+
+            // Notice that ArgumentNullException and ArgumentException take the parameters in opposite order :P
+            const string errorMessage = "The parameter can not be either null or empty or consist only of white space characters.";
+            if (null == value)
+            {
+                throw new ArgumentNullException(name, errorMessage);
+            }
+            if ("" == value.Trim())
+            {
+                throw new ArgumentException(errorMessage, name);
+            }
+        }
+
+        /// <summary>Verifies that an argument is not null.</summary>
+        /// <typeparam name="T">Type of the object to validate.  Must be a class.</typeparam>
+        /// <param name="obj">The object to validate.</param>
+        /// <param name="name">The name of the parameter that will be presented if an exception is thrown.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsNotDefault<T>(T obj, string name) where T : struct
+        {
+            if (default(T).Equals(obj))
+            {
+                throw new ArgumentException("The parameter must not be the default value.", name);
+            }
+        }
+
+        /// <summary>Verifies that an argument is not null.</summary>
+        /// <typeparam name="T">Type of the object to validate.  Must be a class.</typeparam>
+        /// <param name="obj">The object to validate.</param>
+        /// <param name="name">The name of the parameter that will be presented if an exception is thrown.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsNotNull<T>(T obj, string name) where T : class
+        {
+            if (null == obj)
+            {
+                throw new ArgumentNullException(name);
+            }
+        }
+
+        /// <summary>Verifies that an argument is null.</summary>
+        /// <typeparam name="T">Type of the object to validate.  Must be a class.</typeparam>
+        /// <param name="obj">The object to validate.</param>
+        /// <param name="name">The name of the parameter that will be presented if an exception is thrown.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsNull<T>(T obj, string name) where T : class
+        {
+            if (null != obj)
+            {
+                throw new ArgumentException("The parameter must be null.", name);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void PropertyIsNotNull<T>(T obj, string name) where T : class
+        {
+            if (null == obj)
+            {
+                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} cannot be null at this time.", name));
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void PropertyIsNull<T>(T obj, string name) where T : class
+        {
+            if (null != obj)
+            {
+                throw new InvalidOperationException(string.Format(CultureInfo.InvariantCulture, "The property {0} must be null at this time.", name));
+            }
+        }
+
+        /// <summary>
+        /// Verifies the specified statement is true.  Throws an ArgumentException if it's not.
+        /// </summary>
+        /// <param name="statement">The statement to be verified as true.</param>
+        /// <param name="name">Name of the parameter to include in the ArgumentException.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsTrue(bool statement, string name)
+        {
+            if (!statement)
+            {
+                throw new ArgumentException("", name);
+            }
+        }
+
+        /// <summary>
+        /// Verifies the specified statement is true.  Throws an ArgumentException if it's not.
+        /// </summary>
+        /// <param name="statement">The statement to be verified as true.</param>
+        /// <param name="name">Name of the parameter to include in the ArgumentException.</param>
+        /// <param name="message">The message to include in the ArgumentException.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void IsTrue(bool statement, string name, string message)
+        {
+            if (!statement)
+            {
+                throw new ArgumentException(message, name);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void AreEqual<T>(T expected, T actual, string parameterName, string message)
+        {
+            if (null == expected)
+            {
+                // Two nulls are considered equal, regardless of type semantics.
+                if (null != actual && !actual.Equals(expected))
+                {
+                    throw new ArgumentException(message, parameterName);
+                }
+            }
+            else if (!expected.Equals(actual))
+            {
+                throw new ArgumentException(message, parameterName);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void AreNotEqual<T>(T notExpected, T actual, string parameterName, string message)
+        {
+            if (null == notExpected)
+            {
+                // Two nulls are considered equal, regardless of type semantics.
+                if (null == actual || actual.Equals(notExpected))
+                {
+                    throw new ArgumentException(message, parameterName);
+                }
+            }
+            else if (notExpected.Equals(actual))
+            {
+                throw new ArgumentException(message, parameterName);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void UriIsAbsolute(Uri uri, string parameterName)
+        {
+            Verify.IsNotNull(uri, parameterName);
+            if (!uri.IsAbsoluteUri)
+            {
+                throw new ArgumentException("The URI must be absolute.", parameterName);
+            }
+        }
+
+        /// <summary>
+        /// Verifies that the specified value is within the expected range.  The assertion fails if it isn't.
+        /// </summary>
+        /// <param name="lowerBoundInclusive">The lower bound inclusive value.</param>
+        /// <param name="value">The value to verify.</param>
+        /// <param name="upperBoundExclusive">The upper bound exclusive value.</param>
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void BoundedInteger(int lowerBoundInclusive, int value, int upperBoundExclusive, string parameterName)
+        {
+            if (value < lowerBoundInclusive || value >= upperBoundExclusive)
+            {
+                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The integer value must be bounded with [{0}, {1})", lowerBoundInclusive, upperBoundExclusive), parameterName);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void BoundedDoubleInc(double lowerBoundInclusive, double value, double upperBoundInclusive, string message, string parameter)
+        {
+            if (value < lowerBoundInclusive || value > upperBoundInclusive)
+            {
+                throw new ArgumentException(message, parameter);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void TypeSupportsInterface(Type type, Type interfaceType, string parameterName)
+        {
+            Assert.IsNeitherNullNorEmpty(parameterName);
+            Verify.IsNotNull(type, "type");
+            Verify.IsNotNull(interfaceType, "interfaceType");
+
+            if (type.GetInterface(interfaceType.Name) == null)
+            {
+                throw new ArgumentException("The type of this parameter does not support a required interface", parameterName);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        public static void FileExists(string filePath, string parameterName)
+        {
+            Verify.IsNeitherNullNorEmpty(filePath, parameterName);
+            if (!File.Exists(filePath))
+            {
+                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "No file exists at \"{0}\"", filePath), parameterName);
+            }
+        }
+
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [DebuggerStepThrough]
+        internal static void ImplementsInterface(object parameter, Type interfaceType, string parameterName)
+        {
+            Assert.IsNotNull(parameter);
+            Assert.IsNotNull(interfaceType);
+            Assert.IsTrue(interfaceType.IsInterface);
+
+            bool isImplemented = false;
+            foreach (var ifaceType in parameter.GetType().GetInterfaces())
+            {
+                if (ifaceType == interfaceType)
+                {
+                    isImplemented = true;
+                    break;
+                }
+            }
+
+            if (!isImplemented)
+            {
+                throw new ArgumentException(string.Format(CultureInfo.InvariantCulture, "The parameter must implement interface {0}.", interfaceType.ToString()), parameterName);
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
new file mode 100644
index 000000000..15da4b4a4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
@@ -0,0 +1,107 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+namespace Microsoft.Windows.Shell
+{
+    using System;
+    using System.Windows;
+    using System.Windows.Input;
+    using System.Windows.Interop;
+    using Standard;
+
+    public static class SystemCommands
+    {
+        public static RoutedCommand CloseWindowCommand { get; private set; }
+        public static RoutedCommand MaximizeWindowCommand { get; private set; }
+        public static RoutedCommand MinimizeWindowCommand { get; private set; }
+        public static RoutedCommand RestoreWindowCommand { get; private set; }
+        public static RoutedCommand ShowSystemMenuCommand { get; private set; }
+
+        static SystemCommands()
+        {
+            CloseWindowCommand = new RoutedCommand("CloseWindow", typeof(SystemCommands));
+            MaximizeWindowCommand = new RoutedCommand("MaximizeWindow", typeof(SystemCommands));
+            MinimizeWindowCommand = new RoutedCommand("MinimizeWindow", typeof(SystemCommands));
+            RestoreWindowCommand = new RoutedCommand("RestoreWindow", typeof(SystemCommands));
+            ShowSystemMenuCommand = new RoutedCommand("ShowSystemMenu", typeof(SystemCommands));                 
+        }
+
+        private static void _PostSystemCommand(Window window, SC command)
+        {
+            IntPtr hwnd = new WindowInteropHelper(window).Handle;
+            if (hwnd == IntPtr.Zero || !NativeMethods.IsWindow(hwnd))
+            {
+                return;
+            }
+
+            NativeMethods.PostMessage(hwnd, WM.SYSCOMMAND, new IntPtr((int)command), IntPtr.Zero);
+        }
+
+        public static void CloseWindow(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            _PostSystemCommand(window, SC.CLOSE);
+        }
+
+        public static void MaximizeWindow(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            _PostSystemCommand(window, SC.MAXIMIZE);
+        }
+
+        public static void MinimizeWindow(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            _PostSystemCommand(window, SC.MINIMIZE);
+        }
+
+        public static void RestoreWindow(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            _PostSystemCommand(window, SC.RESTORE);
+        }
+
+        /// <summary>Display the system menu at a specified location.</summary>
+        /// <param name="screenLocation">The location to display the system menu, in logical screen coordinates.</param>
+        public static void ShowSystemMenu(Window window, Point screenLocation)
+        {
+            Verify.IsNotNull(window, "window");
+            ShowSystemMenuPhysicalCoordinates(window, DpiHelper.LogicalPixelsToDevice(screenLocation));
+        }
+
+        internal static void ShowSystemMenuPhysicalCoordinates(Window window, Point physicalScreenLocation)
+        {
+            const uint TPM_RETURNCMD = 0x0100;
+            const uint TPM_LEFTBUTTON = 0x0;
+
+            Verify.IsNotNull(window, "window");
+            IntPtr hwnd = new WindowInteropHelper(window).Handle;
+            if (hwnd == IntPtr.Zero || !NativeMethods.IsWindow(hwnd))
+            {
+                return;
+            }
+
+            IntPtr hmenu = NativeMethods.GetSystemMenu(hwnd, false);
+
+            uint cmd = NativeMethods.TrackPopupMenuEx(hmenu, TPM_LEFTBUTTON | TPM_RETURNCMD, (int)physicalScreenLocation.X, (int)physicalScreenLocation.Y, hwnd, IntPtr.Zero);
+            if (0 != cmd)
+            {
+                NativeMethods.PostMessage(hwnd, WM.SYSCOMMAND, new IntPtr(cmd), IntPtr.Zero);
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
new file mode 100644
index 000000000..9ce6ef42b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
@@ -0,0 +1,573 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Microsoft.Windows.Shell
+{
+    using System;
+    using System.Collections.Generic;
+    using System.ComponentModel;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Runtime.InteropServices;
+    using System.Windows;
+    using System.Windows.Media;
+    using Standard;
+
+    [SuppressMessage("Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable")]
+    public class SystemParameters2 : INotifyPropertyChanged
+    {
+        private delegate void _SystemMetricUpdate(IntPtr wParam, IntPtr lParam);
+
+        [ThreadStatic]
+        private static SystemParameters2 _threadLocalSingleton;
+
+        private MessageWindow _messageHwnd;
+
+        private bool _isGlassEnabled;
+        private Color _glassColor;
+        private SolidColorBrush _glassColorBrush;
+        private Thickness _windowResizeBorderThickness;
+        private Thickness _windowNonClientFrameThickness;
+        private double _captionHeight;
+        private Size _smallIconSize;
+        private string _uxThemeName;
+        private string _uxThemeColor;
+        private bool _isHighContrast;
+        private CornerRadius _windowCornerRadius;
+        private Rect _captionButtonLocation;
+
+        private readonly Dictionary<WM, List<_SystemMetricUpdate>> _UpdateTable;
+
+        #region Initialization and Update Methods
+
+        // Most properties exposed here have a way of being queried directly
+        // and a way of being notified of updates via a window message.
+        // This region is a grouping of both, for each of the exposed properties.
+
+        private void _InitializeIsGlassEnabled()
+        {
+            IsGlassEnabled = NativeMethods.DwmIsCompositionEnabled();
+        }
+
+        private void _UpdateIsGlassEnabled(IntPtr wParam, IntPtr lParam)
+        {
+            // Neither the wParam or lParam are used in this case.
+            _InitializeIsGlassEnabled();
+        }
+
+        private void _InitializeGlassColor()
+        {
+            bool isOpaque;
+            uint color;
+            NativeMethods.DwmGetColorizationColor(out color, out isOpaque);
+            color |= isOpaque ? 0xFF000000 : 0;
+
+            WindowGlassColor = Utility.ColorFromArgbDword(color);
+
+            var glassBrush = new SolidColorBrush(WindowGlassColor);
+            glassBrush.Freeze();
+
+            WindowGlassBrush = glassBrush;
+        }
+
+        private void _UpdateGlassColor(IntPtr wParam, IntPtr lParam)
+        {
+            bool isOpaque = lParam != IntPtr.Zero;
+            uint color = unchecked((uint)(int)wParam.ToInt64());
+            color |= isOpaque ? 0xFF000000 : 0;
+            WindowGlassColor = Utility.ColorFromArgbDword(color);
+            var glassBrush = new SolidColorBrush(WindowGlassColor);
+            glassBrush.Freeze();
+            WindowGlassBrush = glassBrush;
+        }
+
+        private void _InitializeCaptionHeight()
+        {
+            Point ptCaption = new Point(0, NativeMethods.GetSystemMetrics(SM.CYCAPTION));
+            WindowCaptionHeight = DpiHelper.DevicePixelsToLogical(ptCaption).Y;
+        }
+
+        private void _UpdateCaptionHeight(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeCaptionHeight();
+        }
+
+        private void _InitializeWindowResizeBorderThickness()
+        {
+            Size frameSize = new Size(
+                NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME),
+                NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME));
+            Size frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize);
+            WindowResizeBorderThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height, frameSizeInDips.Width, frameSizeInDips.Height);
+        }
+
+        private void _UpdateWindowResizeBorderThickness(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeWindowResizeBorderThickness();
+        }
+
+        private void _InitializeWindowNonClientFrameThickness()
+        {
+            Size frameSize = new Size(
+                NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME),
+                NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME));
+            Size frameSizeInDips = DpiHelper.DeviceSizeToLogical(frameSize);
+            int captionHeight = NativeMethods.GetSystemMetrics(SM.CYCAPTION);
+            double captionHeightInDips = DpiHelper.DevicePixelsToLogical(new Point(0, captionHeight)).Y;
+            WindowNonClientFrameThickness = new Thickness(frameSizeInDips.Width, frameSizeInDips.Height + captionHeightInDips, frameSizeInDips.Width, frameSizeInDips.Height);
+        }
+
+        private void _UpdateWindowNonClientFrameThickness(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeWindowNonClientFrameThickness();
+        }
+
+        private void _InitializeSmallIconSize()
+        {
+            SmallIconSize = new Size(
+                NativeMethods.GetSystemMetrics(SM.CXSMICON),
+                NativeMethods.GetSystemMetrics(SM.CYSMICON));
+        }
+
+        private void _UpdateSmallIconSize(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeSmallIconSize();
+        }
+
+        private void _LegacyInitializeCaptionButtonLocation()
+        {
+            // This calculation isn't quite right, but it's pretty close.
+            // I expect this is good enough for the scenarios where this is expected to be used.
+            int captionX = NativeMethods.GetSystemMetrics(SM.CXSIZE);
+            int captionY = NativeMethods.GetSystemMetrics(SM.CYSIZE);
+
+            int frameX = NativeMethods.GetSystemMetrics(SM.CXSIZEFRAME) + NativeMethods.GetSystemMetrics(SM.CXEDGE);
+            int frameY = NativeMethods.GetSystemMetrics(SM.CYSIZEFRAME) + NativeMethods.GetSystemMetrics(SM.CYEDGE);
+
+            Rect captionRect = new Rect(0, 0, captionX * 3, captionY);
+            captionRect.Offset(-frameX - captionRect.Width, frameY);
+
+            WindowCaptionButtonsLocation = captionRect;
+        }
+
+        [SuppressMessage("Microsoft.Security", "CA2122:DoNotIndirectlyExposeMethodsWithLinkDemands")]
+        private void _InitializeCaptionButtonLocation()
+        {
+            // There is a completely different way to do this on XP.
+            if (!Utility.IsOSVistaOrNewer || !NativeMethods.IsThemeActive())
+            {
+                _LegacyInitializeCaptionButtonLocation();
+                return;
+            }
+
+            var tbix = new TITLEBARINFOEX { cbSize = Marshal.SizeOf(typeof(TITLEBARINFOEX)) };
+            IntPtr lParam = Marshal.AllocHGlobal(tbix.cbSize);
+            try
+            {
+                Marshal.StructureToPtr(tbix, lParam, false);
+                // This might flash a window in the taskbar while being calculated.
+                // WM_GETTITLEBARINFOEX doesn't work correctly unless the window is visible while processing.
+                NativeMethods.ShowWindow(_messageHwnd.Handle, SW.SHOW);
+                NativeMethods.SendMessage(_messageHwnd.Handle, WM.GETTITLEBARINFOEX, IntPtr.Zero, lParam);
+                tbix = (TITLEBARINFOEX)Marshal.PtrToStructure(lParam, typeof(TITLEBARINFOEX));
+            }
+            finally
+            {
+                NativeMethods.ShowWindow(_messageHwnd.Handle, SW.HIDE);
+                Utility.SafeFreeHGlobal(ref lParam);
+            }
+
+            // TITLEBARINFOEX has information relative to the screen.  We need to convert the containing rect
+            // to instead be relative to the top-right corner of the window.
+            RECT rcAllCaptionButtons = RECT.Union(tbix.rgrect_CloseButton, tbix.rgrect_MinimizeButton);
+            // For all known themes, the RECT for the maximize box shouldn't add anything to the union of the minimize and close boxes.
+            Assert.AreEqual(rcAllCaptionButtons, RECT.Union(rcAllCaptionButtons, tbix.rgrect_MaximizeButton));
+
+            RECT rcWindow = NativeMethods.GetWindowRect(_messageHwnd.Handle);
+
+            // Reorient the Top/Right to be relative to the top right edge of the Window.
+            var deviceCaptionLocation = new Rect(
+                rcAllCaptionButtons.Left - rcWindow.Width - rcWindow.Left,
+                rcAllCaptionButtons.Top - rcWindow.Top,
+                rcAllCaptionButtons.Width,
+                rcAllCaptionButtons.Height);
+
+            Rect logicalCaptionLocation = DpiHelper.DeviceRectToLogical(deviceCaptionLocation);
+
+            WindowCaptionButtonsLocation = logicalCaptionLocation;
+        }
+
+        private void _UpdateCaptionButtonLocation(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeCaptionButtonLocation();
+        }
+
+        private void _InitializeHighContrast()
+        {
+            HIGHCONTRAST hc = NativeMethods.SystemParameterInfo_GetHIGHCONTRAST();
+            HighContrast = (hc.dwFlags & HCF.HIGHCONTRASTON) != 0;
+        }
+
+        private void _UpdateHighContrast(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeHighContrast();
+        }
+
+        private void _InitializeThemeInfo()
+        {
+            if (!NativeMethods.IsThemeActive())
+            {
+                UxThemeName = "Classic";
+                UxThemeColor = "";
+                return;
+            }
+
+            string name;
+            string color;
+            string size;
+            NativeMethods.GetCurrentThemeName(out name, out color, out size);
+
+            // Consider whether this is the most useful way to expose this...
+            UxThemeName = System.IO.Path.GetFileNameWithoutExtension(name);
+            UxThemeColor = color;
+        }
+
+        private void _UpdateThemeInfo(IntPtr wParam, IntPtr lParam)
+        {
+            _InitializeThemeInfo();
+        }
+
+        private void _InitializeWindowCornerRadius()
+        {
+            // The radius of window corners isn't exposed as a true system parameter.
+            // It instead is a logical size that we're approximating based on the current theme.
+            // There aren't any known variations based on theme color.
+            Assert.IsNeitherNullNorEmpty(UxThemeName);
+
+            // These radii are approximate.  The way WPF does rounding is different than how
+            //     rounded-rectangle HRGNs are created, which is also different than the actual
+            //     round corners on themed Windows.  For now we're not exposing anything to
+            //     mitigate the differences.
+            var cornerRadius = default(CornerRadius);
+
+            // This list is known to be incomplete and very much not future-proof.
+            // On XP there are at least a couple of shipped themes that this won't catch,
+            // "Zune" and "Royale", but WPF doesn't know about these either.
+            // If a new theme was to replace Aero, then this will fall back on "classic" behaviors.
+            // This isn't ideal, but it's not the end of the world.  WPF will generally have problems anyways.
+            switch (UxThemeName.ToUpperInvariant())
+            {
+                case "LUNA":
+                    cornerRadius = new CornerRadius(6, 6, 0, 0);
+                    break;
+                case "AERO":
+                    // Aero has two cases.  One with glass and one without...
+                    if (NativeMethods.DwmIsCompositionEnabled())
+                    {
+                        cornerRadius = new CornerRadius(8);
+                    }
+                    else
+                    {
+                        cornerRadius = new CornerRadius(6, 6, 0, 0);
+                    }
+                    break;
+                case "CLASSIC":
+                case "ZUNE":
+                case "ROYALE":
+                default:
+                    cornerRadius = new CornerRadius(0);
+                    break;
+            }
+
+            WindowCornerRadius = cornerRadius;
+        }
+
+        private void _UpdateWindowCornerRadius(IntPtr wParam, IntPtr lParam)
+        {
+            // Neither the wParam or lParam are used in this case.
+            _InitializeWindowCornerRadius();
+        }
+
+
+        #endregion
+
+        /// <summary>
+        /// Private constructor.  The public way to access this class is through the static Current property.
+        /// </summary>
+        private SystemParameters2()
+        {
+            // This window gets used for calculations about standard caption button locations
+            // so it has WS_OVERLAPPEDWINDOW as a style to give it normal caption buttons.
+            // This window may be shown during calculations of caption bar information, so create it at a location that's likely offscreen.
+            _messageHwnd = new MessageWindow((CS)0, WS.OVERLAPPEDWINDOW | WS.DISABLED, (WS_EX)0, new Rect(-16000, -16000, 100, 100), "", _WndProc);
+            _messageHwnd.Dispatcher.ShutdownStarted += (sender, e) => Utility.SafeDispose(ref _messageHwnd);
+
+            // Fixup the default values of the DPs.
+            _InitializeIsGlassEnabled();
+            _InitializeGlassColor();
+            _InitializeCaptionHeight();
+            _InitializeWindowNonClientFrameThickness();
+            _InitializeWindowResizeBorderThickness();
+            _InitializeCaptionButtonLocation();
+            _InitializeSmallIconSize();
+            _InitializeHighContrast();
+            _InitializeThemeInfo();
+            // WindowCornerRadius isn't exposed by true system parameters, so it requires the theme to be initialized first.
+            _InitializeWindowCornerRadius();
+
+            _UpdateTable = new Dictionary<WM, List<_SystemMetricUpdate>>
+            {
+                { WM.THEMECHANGED,
+                    new List<_SystemMetricUpdate>
+                    {
+                        _UpdateThemeInfo, 
+                        _UpdateHighContrast, 
+                        _UpdateWindowCornerRadius,
+                        _UpdateCaptionButtonLocation, } },
+                { WM.SETTINGCHANGE,
+                    new List<_SystemMetricUpdate>
+                    {
+                        _UpdateCaptionHeight,
+                        _UpdateWindowResizeBorderThickness,
+                        _UpdateSmallIconSize,
+                        _UpdateHighContrast,
+                        _UpdateWindowNonClientFrameThickness,
+                        _UpdateCaptionButtonLocation, } },
+                { WM.DWMNCRENDERINGCHANGED, new List<_SystemMetricUpdate> { _UpdateIsGlassEnabled } },
+                { WM.DWMCOMPOSITIONCHANGED, new List<_SystemMetricUpdate> { _UpdateIsGlassEnabled } },
+                { WM.DWMCOLORIZATIONCOLORCHANGED, new List<_SystemMetricUpdate> { _UpdateGlassColor } },
+            };
+        }
+
+        public static SystemParameters2 Current
+        {
+            get
+            {
+                if (_threadLocalSingleton == null)
+                {
+                    _threadLocalSingleton = new SystemParameters2();
+                }
+                return _threadLocalSingleton;
+            }
+        }
+
+        private IntPtr _WndProc(IntPtr hwnd, WM msg, IntPtr wParam, IntPtr lParam)
+        {
+            // Don't do this if called within the SystemParameters2 constructor
+            if (_UpdateTable != null)
+            {
+                List<_SystemMetricUpdate> handlers;
+                if (_UpdateTable.TryGetValue(msg, out handlers))
+                {
+                    Assert.IsNotNull(handlers);
+                    foreach (var handler in handlers)
+                    {
+                        handler(wParam, lParam);
+                    }
+                }
+            }
+
+            return NativeMethods.DefWindowProc(hwnd, msg, wParam, lParam);
+        }
+
+        public bool IsGlassEnabled
+        {
+            get
+            {
+                // return _isGlassEnabled;
+                // It turns out there may be some lag between someone asking this
+                // and the window getting updated.  It's not too expensive, just always do the check.
+                return NativeMethods.DwmIsCompositionEnabled();
+            }
+            private set
+            {
+                if (value != _isGlassEnabled)
+                {
+                    _isGlassEnabled = value;
+                    _NotifyPropertyChanged("IsGlassEnabled");
+                }
+            }
+        }
+
+        public Color WindowGlassColor
+        {
+            get { return _glassColor; }
+            private set
+            {
+                if (value != _glassColor)
+                {
+                    _glassColor = value;
+                    _NotifyPropertyChanged("WindowGlassColor");
+                }
+            }
+        }
+
+        public SolidColorBrush WindowGlassBrush
+        {
+            get { return _glassColorBrush; }
+            private set
+            {
+                Assert.IsNotNull(value);
+                Assert.IsTrue(value.IsFrozen);
+                if (_glassColorBrush == null || value.Color != _glassColorBrush.Color)
+                {
+                    _glassColorBrush = value;
+                    _NotifyPropertyChanged("WindowGlassBrush");
+                }
+            }
+        }
+
+        public Thickness WindowResizeBorderThickness
+        {
+            get { return _windowResizeBorderThickness; }
+            private set
+            {
+                if (value != _windowResizeBorderThickness)
+                {
+                    _windowResizeBorderThickness = value;
+                    _NotifyPropertyChanged("WindowResizeBorderThickness");
+                }
+            }
+        }
+
+        public Thickness WindowNonClientFrameThickness
+        {
+            get { return _windowNonClientFrameThickness; }
+            private set
+            {
+                if (value != _windowNonClientFrameThickness)
+                {
+                    _windowNonClientFrameThickness = value;
+                    _NotifyPropertyChanged("WindowNonClientFrameThickness");
+                }
+            }
+        }
+
+        public double WindowCaptionHeight
+        {
+            get { return _captionHeight; }
+            private set
+            {
+                if (value != _captionHeight)
+                {
+                    _captionHeight = value;
+                    _NotifyPropertyChanged("WindowCaptionHeight");
+                }
+            }
+        }
+
+        public Size SmallIconSize
+        {
+            get { return new Size(_smallIconSize.Width, _smallIconSize.Height); }
+            private set
+            {
+                if (value != _smallIconSize)
+                {
+                    _smallIconSize = value;
+                    _NotifyPropertyChanged("SmallIconSize");
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
+        public string UxThemeName
+        {
+            get { return _uxThemeName; }
+            private set
+            {
+                if (value != _uxThemeName)
+                {
+                    _uxThemeName = value;
+                    _NotifyPropertyChanged("UxThemeName");
+                }
+            }
+        }
+
+        [SuppressMessage("Microsoft.Naming", "CA1709:IdentifiersShouldBeCasedCorrectly", MessageId = "Ux")]
+        [SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Ux")]
+        public string UxThemeColor
+        {
+            get { return _uxThemeColor; }
+            private set
+            {
+                if (value != _uxThemeColor)
+                {
+                    _uxThemeColor = value;
+                    _NotifyPropertyChanged("UxThemeColor");
+                }
+            }
+        }
+
+        public bool HighContrast
+        {
+            get { return _isHighContrast; }
+            private set
+            {
+                if (value != _isHighContrast)
+                {
+                    _isHighContrast = value;
+                    _NotifyPropertyChanged("HighContrast");
+                }
+            }
+        }
+
+        public CornerRadius WindowCornerRadius
+        {
+            get { return _windowCornerRadius; }
+            private set
+            {
+                if (value != _windowCornerRadius)
+                {
+                    _windowCornerRadius = value;
+                    _NotifyPropertyChanged("WindowCornerRadius");
+                }
+            }
+        }
+
+        public Rect WindowCaptionButtonsLocation
+        {
+            get { return _captionButtonLocation; }
+            private set
+            {
+                if (value != _captionButtonLocation)
+                {
+                    _captionButtonLocation = value;
+                    _NotifyPropertyChanged("WindowCaptionButtonsLocation");
+                }
+            }
+        }
+
+        #region INotifyPropertyChanged Members
+
+        private void _NotifyPropertyChanged(string propertyName)
+        {
+            Assert.IsNeitherNullNorEmpty(propertyName);
+            var handler = PropertyChanged;
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(propertyName));
+            }
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
new file mode 100644
index 000000000..da25da6f3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
@@ -0,0 +1,267 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Microsoft.Windows.Shell
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Windows;
+    using System.Windows.Data;
+    using Standard;
+
+    public class WindowChrome : Freezable
+    {
+        private struct _SystemParameterBoundProperty
+        {
+            public string SystemParameterPropertyName { get; set; }
+            public DependencyProperty DependencyProperty { get; set; }
+        }
+
+        // Named property available for fully extending the glass frame.
+        public static Thickness GlassFrameCompleteThickness { get { return new Thickness(-1); } }
+
+        #region Attached Properties
+
+        public static readonly DependencyProperty WindowChromeProperty = DependencyProperty.RegisterAttached(
+            "WindowChrome",
+            typeof(WindowChrome),
+            typeof(WindowChrome),
+            new PropertyMetadata(null, _OnChromeChanged));
+
+        private static void _OnChromeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            // The different design tools handle drawing outside their custom window objects differently.
+            // Rather than try to support this concept in the design surface let the designer draw its own
+            // chrome anyways.
+            // There's certainly room for improvement here.
+            if (System.ComponentModel.DesignerProperties.GetIsInDesignMode(d))
+            {
+                return;
+            }
+
+            var window = (Window)d;
+            var newChrome = (WindowChrome)e.NewValue;
+
+            Assert.IsNotNull(window);
+
+            // Update the ChromeWorker with this new object.
+
+            // If there isn't currently a worker associated with the Window then assign a new one.
+            // There can be a many:1 relationship of to Window to WindowChrome objects, but a 1:1 for a Window and a WindowChromeWorker.
+            WindowChromeWorker chromeWorker = WindowChromeWorker.GetWindowChromeWorker(window);
+            if (chromeWorker == null)
+            {
+                chromeWorker = new WindowChromeWorker();
+                WindowChromeWorker.SetWindowChromeWorker(window, chromeWorker);
+            }
+
+            chromeWorker.SetWindowChrome(newChrome);
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static WindowChrome GetWindowChrome(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            return (WindowChrome)window.GetValue(WindowChromeProperty);
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static void SetWindowChrome(Window window, WindowChrome chrome)
+        {
+            Verify.IsNotNull(window, "window");
+            window.SetValue(WindowChromeProperty, chrome);
+        }
+
+        public static readonly DependencyProperty IsHitTestVisibleInChromeProperty = DependencyProperty.RegisterAttached(
+            "IsHitTestVisibleInChrome",
+            typeof(bool),
+            typeof(WindowChrome),
+            new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.Inherits));
+
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static bool GetIsHitTestVisibleInChrome(IInputElement inputElement)
+        {
+            Verify.IsNotNull(inputElement, "inputElement");
+            var dobj = inputElement as DependencyObject;
+            if (dobj == null)
+            {
+                throw new ArgumentException("The element must be a DependencyObject", "inputElement");
+            }
+            return (bool)dobj.GetValue(IsHitTestVisibleInChromeProperty);
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1062:Validate arguments of public methods", MessageId = "0")]
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static void SetIsHitTestVisibleInChrome(IInputElement inputElement, bool hitTestVisible)
+        {
+            Verify.IsNotNull(inputElement, "inputElement");
+            var dobj = inputElement as DependencyObject;
+            if (dobj == null)
+            {
+                throw new ArgumentException("The element must be a DependencyObject", "inputElement");
+            }
+            dobj.SetValue(IsHitTestVisibleInChromeProperty, hitTestVisible);
+        }
+
+        #endregion
+
+        #region Dependency Properties
+
+        public static readonly DependencyProperty CaptionHeightProperty = DependencyProperty.Register(
+            "CaptionHeight",
+            typeof(double),
+            typeof(WindowChrome),
+            new PropertyMetadata(
+                0d,
+                (d, e) => ((WindowChrome)d)._OnPropertyChangedThatRequiresRepaint()),
+            value => (double)value >= 0d);
+
+        /// <summary>The extent of the top of the window to treat as the caption.</summary>
+        public double CaptionHeight
+        {
+            get { return (double)GetValue(CaptionHeightProperty); }
+            set { SetValue(CaptionHeightProperty, value); }
+        }
+
+        public static readonly DependencyProperty ResizeBorderThicknessProperty = DependencyProperty.Register(
+            "ResizeBorderThickness",
+            typeof(Thickness),
+            typeof(WindowChrome),
+            new PropertyMetadata(default(Thickness)),
+            (value) => Utility.IsThicknessNonNegative((Thickness)value));
+
+        public Thickness ResizeBorderThickness
+        {
+            get { return (Thickness)GetValue(ResizeBorderThicknessProperty); }
+            set { SetValue(ResizeBorderThicknessProperty, value); }
+        }
+
+        public static readonly DependencyProperty GlassFrameThicknessProperty = DependencyProperty.Register(
+            "GlassFrameThickness",
+            typeof(Thickness),
+            typeof(WindowChrome),
+            new PropertyMetadata(
+                default(Thickness),
+                (d, e) => ((WindowChrome)d)._OnPropertyChangedThatRequiresRepaint(),
+                (d, o) => _CoerceGlassFrameThickness((Thickness)o)));
+
+        private static object _CoerceGlassFrameThickness(Thickness thickness)
+        {
+            // If it's explicitly set, but set to a thickness with at least one negative side then 
+            // coerce the value to the stock GlassFrameCompleteThickness.
+            if (!Utility.IsThicknessNonNegative(thickness))
+            {
+                return GlassFrameCompleteThickness;
+            }
+
+            return thickness;
+        }
+        public Thickness GlassFrameThickness
+        {
+            get { return (Thickness)GetValue(GlassFrameThicknessProperty); }
+            set { SetValue(GlassFrameThicknessProperty, value); }
+        }
+
+        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register(
+            "CornerRadius",
+            typeof(CornerRadius),
+            typeof(WindowChrome),
+            new PropertyMetadata(
+                default(CornerRadius),
+                (d, e) => ((WindowChrome)d)._OnPropertyChangedThatRequiresRepaint()),
+            (value) => Utility.IsCornerRadiusValid((CornerRadius)value));
+
+        public CornerRadius CornerRadius
+        {
+            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
+            set { SetValue(CornerRadiusProperty, value); }
+        }
+
+        #region ShowSystemMenu
+
+        /// <summary>
+        /// Gets or sets the ShowSystemMenu property.  This dependency property 
+        /// indicates if the system menu should be shown at right click on the caption.
+        /// </summary>
+        public bool ShowSystemMenu
+        {
+            get;
+            set;
+        }
+
+        #endregion
+
+
+
+        #endregion
+
+        protected override Freezable CreateInstanceCore()
+        {
+            return new WindowChrome();
+        }
+
+        private static readonly List<_SystemParameterBoundProperty> _BoundProperties = new List<_SystemParameterBoundProperty>
+        {
+            new _SystemParameterBoundProperty { DependencyProperty = CornerRadiusProperty, SystemParameterPropertyName = "WindowCornerRadius" },
+            new _SystemParameterBoundProperty { DependencyProperty = CaptionHeightProperty, SystemParameterPropertyName = "WindowCaptionHeight" },
+            new _SystemParameterBoundProperty { DependencyProperty = ResizeBorderThicknessProperty, SystemParameterPropertyName = "WindowResizeBorderThickness" },
+            new _SystemParameterBoundProperty { DependencyProperty = GlassFrameThicknessProperty, SystemParameterPropertyName = "WindowNonClientFrameThickness" },
+        };
+
+        public WindowChrome()
+        {
+            // Effective default values for some of these properties are set to be bindings
+            // that set them to system defaults.
+            // A more correct way to do this would be to Coerce the value iff the source of the DP was the default value.
+            // Unfortunately with the current property system we can't detect whether the value being applied at the time
+            // of the coersion is the default.
+            foreach (var bp in _BoundProperties)
+            {
+                // This list must be declared after the DP's are assigned.
+                Assert.IsNotNull(bp.DependencyProperty);
+                BindingOperations.SetBinding(
+                    this,
+                    bp.DependencyProperty,
+                    new Binding
+                    {
+                        Source = SystemParameters2.Current,
+                        Path = new PropertyPath(bp.SystemParameterPropertyName),
+                        Mode = BindingMode.OneWay,
+                        UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
+                    });
+            }
+        }
+
+        private void _OnPropertyChangedThatRequiresRepaint()
+        {
+            var handler = PropertyChangedThatRequiresRepaint;
+            if (handler != null)
+            {
+                handler(this, EventArgs.Empty);
+            }
+        }
+
+        internal event EventHandler PropertyChangedThatRequiresRepaint;
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
new file mode 100644
index 000000000..e094ea4af
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
@@ -0,0 +1,1218 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+/**************************************************************************\
+    Copyright Microsoft Corporation. All Rights Reserved.
+\**************************************************************************/
+
+namespace Microsoft.Windows.Shell
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Diagnostics.CodeAnalysis;
+    using System.Runtime.InteropServices;
+    using System.Threading;
+    using System.Windows;
+    using System.Windows.Interop;
+    using System.Windows.Media;
+    using System.Windows.Threading;
+    using Standard;
+
+    using HANDLE_MESSAGE = System.Collections.Generic.KeyValuePair<Standard.WM, Standard.MessageHandler>;
+    using System.Windows.Controls.Primitives;
+
+    internal class WindowChromeWorker : DependencyObject
+    {
+        // Delegate signature used for Dispatcher.BeginInvoke.
+        private delegate void _Action();
+
+        #region Fields
+
+        private const SWP _SwpFlags = SWP.FRAMECHANGED | SWP.NOSIZE | SWP.NOMOVE | SWP.NOZORDER | SWP.NOOWNERZORDER | SWP.NOACTIVATE;
+
+        private readonly List<HANDLE_MESSAGE> _messageTable;
+
+        /// <summary>The Window that's chrome is being modified.</summary>
+        private Window _window;
+        /// <summary>Underlying HWND for the _window.</summary>
+        private IntPtr _hwnd;
+        private HwndSource _hwndSource = null;
+        private bool _isHooked = false;
+
+        // These fields are for tracking workarounds for WPF 3.5SP1 behaviors.
+        private bool _isFixedUp = false;
+        private bool _isUserResizing = false;
+        private bool _hasUserMovedWindow = false;
+        private Point _windowPosAtStartOfUserMove = default(Point);
+
+        // Field to track attempts to force off Device Bitmaps on Win7.
+        private int _blackGlassFixupAttemptCount;
+
+        /// <summary>Object that describes the current modifications being made to the chrome.</summary>
+        private WindowChrome _chromeInfo;
+
+        // Keep track of this so we can detect when we need to apply changes.  Tracking these separately
+        // as I've seen using just one cause things to get enough out of sync that occasionally the caption will redraw.
+        private WindowState _lastRoundingState;
+        private WindowState _lastMenuState;
+        private bool _isGlassEnabled;
+
+        #endregion
+
+        public WindowChromeWorker()
+        {
+            _messageTable = new List<HANDLE_MESSAGE>
+            {
+                new HANDLE_MESSAGE(WM.SETTEXT,               _HandleSetTextOrIcon),
+                new HANDLE_MESSAGE(WM.SETICON,               _HandleSetTextOrIcon),
+                new HANDLE_MESSAGE(WM.NCACTIVATE,            _HandleNCActivate),
+                new HANDLE_MESSAGE(WM.NCCALCSIZE,            _HandleNCCalcSize),
+                new HANDLE_MESSAGE(WM.NCHITTEST,             _HandleNCHitTest),
+                new HANDLE_MESSAGE(WM.NCRBUTTONUP,           _HandleNCRButtonUp),
+                new HANDLE_MESSAGE(WM.SIZE,                  _HandleSize),
+                new HANDLE_MESSAGE(WM.WINDOWPOSCHANGED,      _HandleWindowPosChanged),
+                new HANDLE_MESSAGE(WM.DWMCOMPOSITIONCHANGED, _HandleDwmCompositionChanged), 
+            };
+
+            if (Utility.IsPresentationFrameworkVersionLessThan4)
+            {
+                _messageTable.AddRange(new[] 
+                {
+                   new HANDLE_MESSAGE(WM.SETTINGCHANGE,         _HandleSettingChange),
+                   new HANDLE_MESSAGE(WM.ENTERSIZEMOVE,         _HandleEnterSizeMove),
+                   new HANDLE_MESSAGE(WM.EXITSIZEMOVE,          _HandleExitSizeMove),
+                   new HANDLE_MESSAGE(WM.MOVE,                  _HandleMove),
+                });
+            }
+        }
+
+        public void SetWindowChrome(WindowChrome newChrome)
+        {
+            VerifyAccess();
+            Assert.IsNotNull(_window);
+
+            if (newChrome == _chromeInfo)
+            {
+                // Nothing's changed.
+                return;
+            }
+
+            if (_chromeInfo != null)
+            {
+                _chromeInfo.PropertyChangedThatRequiresRepaint -= _OnChromePropertyChangedThatRequiresRepaint;
+            }
+
+            _chromeInfo = newChrome;
+            if (_chromeInfo != null)
+            {
+                _chromeInfo.PropertyChangedThatRequiresRepaint += _OnChromePropertyChangedThatRequiresRepaint;
+            }
+
+            _ApplyNewCustomChrome();
+        }
+
+        private void _OnChromePropertyChangedThatRequiresRepaint(object sender, EventArgs e)
+        {
+            _UpdateFrameState(true);
+        }
+
+        public static readonly DependencyProperty WindowChromeWorkerProperty = DependencyProperty.RegisterAttached(
+            "WindowChromeWorker",
+            typeof(WindowChromeWorker),
+            typeof(WindowChromeWorker),
+            new PropertyMetadata(null, _OnChromeWorkerChanged));
+
+        private static void _OnChromeWorkerChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var w = (Window)d;
+            var cw = (WindowChromeWorker)e.NewValue;
+
+            // The WindowChromeWorker object should only be set on the window once, and never to null.
+            Assert.IsNotNull(w);
+            Assert.IsNotNull(cw);
+            Assert.IsNull(cw._window);
+
+            cw._SetWindow(w);
+        }
+
+        private void _SetWindow(Window window)
+        {
+            Assert.IsNull(_window);
+            Assert.IsNotNull(window);
+
+            _window = window;
+
+            // There are potentially a couple funny states here.
+            // The window may have been shown and closed, in which case it's no longer usable.
+            // We shouldn't add any hooks in that case, just exit early.
+            // If the window hasn't yet been shown, then we need to make sure to remove hooks after it's closed.
+            _hwnd = new WindowInteropHelper(_window).Handle;
+
+            if (Utility.IsPresentationFrameworkVersionLessThan4)
+            {
+                // On older versions of the framework the client size of the window is incorrectly calculated.
+                // We need to modify the template to fix this on behalf of the user.
+                Utility.AddDependencyPropertyChangeListener(_window, Window.TemplateProperty, _OnWindowPropertyChangedThatRequiresTemplateFixup);
+                Utility.AddDependencyPropertyChangeListener(_window, Window.FlowDirectionProperty, _OnWindowPropertyChangedThatRequiresTemplateFixup);
+            }
+
+            _window.Closed += _UnsetWindow;
+
+            // Use whether we can get an HWND to determine if the Window has been loaded.
+            if (IntPtr.Zero != _hwnd)
+            {
+                // We've seen that the HwndSource can't always be retrieved from the HWND, so cache it early.
+                // Specifically it seems to sometimes disappear when the OS theme is changing.
+                _hwndSource = HwndSource.FromHwnd(_hwnd);
+                Assert.IsNotNull(_hwndSource);
+                _window.ApplyTemplate();
+
+                if (_chromeInfo != null)
+                {
+                    _ApplyNewCustomChrome();
+                }
+            }
+            else
+            {
+                _window.SourceInitialized += (sender, e) =>
+                {
+                    _hwnd = new WindowInteropHelper(_window).Handle;
+                    Assert.IsNotDefault(_hwnd);
+                    _hwndSource = HwndSource.FromHwnd(_hwnd);
+                    Assert.IsNotNull(_hwndSource);
+
+                    if (_chromeInfo != null)
+                    {
+                        _ApplyNewCustomChrome();
+                    }
+                };
+            }
+        }
+
+        private void _UnsetWindow(object sender, EventArgs e)
+        {
+            if (Utility.IsPresentationFrameworkVersionLessThan4)
+            {
+                Utility.RemoveDependencyPropertyChangeListener(_window, Window.TemplateProperty, _OnWindowPropertyChangedThatRequiresTemplateFixup);
+                Utility.RemoveDependencyPropertyChangeListener(_window, Window.FlowDirectionProperty, _OnWindowPropertyChangedThatRequiresTemplateFixup);
+            }
+
+            if (_chromeInfo != null)
+            {
+                _chromeInfo.PropertyChangedThatRequiresRepaint -= _OnChromePropertyChangedThatRequiresRepaint;
+            }
+
+            _RestoreStandardChromeState(true);
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static WindowChromeWorker GetWindowChromeWorker(Window window)
+        {
+            Verify.IsNotNull(window, "window");
+            return (WindowChromeWorker)window.GetValue(WindowChromeWorkerProperty);
+        }
+
+        [SuppressMessage("Microsoft.Design", "CA1011:ConsiderPassingBaseTypesAsParameters")]
+        public static void SetWindowChromeWorker(Window window, WindowChromeWorker chrome)
+        {
+            Verify.IsNotNull(window, "window");
+            window.SetValue(WindowChromeWorkerProperty, chrome);
+        }
+
+        private void _OnWindowPropertyChangedThatRequiresTemplateFixup(object sender, EventArgs e)
+        {
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            if (_chromeInfo != null && _hwnd != IntPtr.Zero)
+            {
+                // Assume that when the template changes it's going to be applied.
+                // We don't have a good way to externally hook into the template
+                // actually being applied, so we asynchronously post the fixup operation
+                // at Loaded priority, so it's expected that the visual tree will be
+                // updated before _FixupFrameworkIssues is called.
+                _window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, (_Action)_FixupFrameworkIssues);
+            }
+        }
+
+        private void _ApplyNewCustomChrome()
+        {
+            if (_hwnd == IntPtr.Zero)
+            {
+                // Not yet hooked.
+                return;
+            }
+
+            if (_chromeInfo == null)
+            {
+                _RestoreStandardChromeState(false);
+                return;
+            }
+
+            if (!_isHooked)
+            {
+                _hwndSource.AddHook(_WndProc);
+                _isHooked = true;
+            }
+
+            _FixupFrameworkIssues();
+
+            // Force this the first time.
+            _UpdateSystemMenu(_window.WindowState);
+            _UpdateFrameState(true);
+
+            NativeMethods.SetWindowPos(_hwnd, IntPtr.Zero, 0, 0, 0, 0, _SwpFlags);
+        }
+
+        private void _FixupFrameworkIssues()
+        {
+            Assert.IsNotNull(_chromeInfo);
+            Assert.IsNotNull(_window);
+
+            // This margin is only necessary if the client rect is going to be calculated incorrectly by WPF.
+            // This bug was fixed in V4 of the framework.
+            if (!Utility.IsPresentationFrameworkVersionLessThan4)
+            {
+                return;
+            }
+
+            if (_window.Template == null)
+            {
+                // Nothing to fixup yet.  This will get called again when a template does get set.
+                return;
+            }
+
+            // Guard against the visual tree being empty.
+            if (VisualTreeHelper.GetChildrenCount(_window) == 0)
+            {
+                // The template isn't null, but we don't have a visual tree.
+                // Hope that ApplyTemplate is in the queue and repost this, because there's not much we can do right now.
+                _window.Dispatcher.BeginInvoke(DispatcherPriority.Loaded, (_Action)_FixupFrameworkIssues);
+                return;
+            }
+
+            var rootElement = (FrameworkElement)VisualTreeHelper.GetChild(_window, 0);
+
+            RECT rcWindow = NativeMethods.GetWindowRect(_hwnd);
+            RECT rcAdjustedClient = _GetAdjustedWindowRect(rcWindow);
+
+            Rect rcLogicalWindow = DpiHelper.DeviceRectToLogical(new Rect(rcWindow.Left, rcWindow.Top, rcWindow.Width, rcWindow.Height));
+            Rect rcLogicalClient = DpiHelper.DeviceRectToLogical(new Rect(rcAdjustedClient.Left, rcAdjustedClient.Top, rcAdjustedClient.Width, rcAdjustedClient.Height));
+
+            Thickness nonClientThickness = new Thickness(
+               rcLogicalWindow.Left - rcLogicalClient.Left,
+               rcLogicalWindow.Top - rcLogicalClient.Top,
+               rcLogicalClient.Right - rcLogicalWindow.Right,
+               rcLogicalClient.Bottom - rcLogicalWindow.Bottom);
+
+            rootElement.Margin = new Thickness(
+                0,
+                0,
+                -(nonClientThickness.Left + nonClientThickness.Right),
+                -(nonClientThickness.Top + nonClientThickness.Bottom));
+
+            // The negative thickness on the margin doesn't properly get applied in RTL layouts.
+            // The width is right, but there is a black bar on the right.
+            // To fix this we just add an additional RenderTransform to the root element.
+            // This works fine, but if the window is dynamically changing its FlowDirection then this can have really bizarre side effects.
+            // This will mostly work if the FlowDirection is dynamically changed, but there aren't many real scenarios that would call for
+            // that so I'm not addressing the rest of the quirkiness.
+            if (_window.FlowDirection == FlowDirection.RightToLeft)
+            {
+                rootElement.RenderTransform = new MatrixTransform(1, 0, 0, 1, -(nonClientThickness.Left + nonClientThickness.Right), 0);
+            }
+            else
+            {
+                rootElement.RenderTransform = null;
+            }
+
+            if (!_isFixedUp)
+            {
+                _hasUserMovedWindow = false;
+                _window.StateChanged += _FixupRestoreBounds;
+
+                _isFixedUp = true;
+            }
+        }
+
+        // There was a regression in DWM in Windows 7 with regard to handling WM_NCCALCSIZE to effect custom chrome.
+        // When windows with glass are maximized on a multimonitor setup the glass frame tends to turn black.
+        // Also when windows are resized they tend to flicker black, sometimes staying that way until resized again.
+        //
+        // This appears to be a bug in DWM related to device bitmap optimizations.  At least on RTM Win7 we can
+        // evoke a legacy code path that bypasses the bug by calling an esoteric DWM function.  This doesn't affect
+        // the system, just the application.
+        // WPF also tends to call this function anyways during animations, so we're just forcing the issue
+        // consistently and a bit earlier.
+        [SuppressMessage("Microsoft.Design", "CA1031:DoNotCatchGeneralExceptionTypes")]
+        private void _FixupWindows7Issues()
+        {
+            if (_blackGlassFixupAttemptCount > 5)
+            {
+                // Don't keep trying if there's an endemic problem with this.
+                return;
+            }
+
+            if (Utility.IsOSWindows7OrNewer && NativeMethods.DwmIsCompositionEnabled())
+            {
+                ++_blackGlassFixupAttemptCount;
+
+                bool success = false;
+                try
+                {
+                    DWM_TIMING_INFO? dti = NativeMethods.DwmGetCompositionTimingInfo(_hwnd);
+                    success = dti != null;
+                }
+                catch (Exception)
+                {
+                    // We aren't sure of all the reasons this could fail.
+                    // If we find new ones we should consider making the NativeMethod swallow them as well.
+                    // Since we have a limited number of retries and this method isn't actually critical, just repost.
+
+                    // Disabling this for the published code to reduce debug noise.  This will get compiled away for retail binaries anyways.
+                    //Assert.Fail(e.Message);
+                }
+
+                // NativeMethods.DwmGetCompositionTimingInfo swallows E_PENDING.
+                // If the call wasn't successful, try again later.
+                if (!success)
+                {
+                    Dispatcher.BeginInvoke(DispatcherPriority.Loaded, (_Action)_FixupWindows7Issues);
+                }
+                else
+                {
+                    // Reset this.  We will want to force this again if DWM composition changes.
+                    _blackGlassFixupAttemptCount = 0;
+                }
+            }
+        }
+
+        private void _FixupRestoreBounds(object sender, EventArgs e)
+        {
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+            if (_window.WindowState == WindowState.Maximized || _window.WindowState == WindowState.Minimized)
+            {
+                // Old versions of WPF sometimes force their incorrect idea of the Window's location
+                // on the Win32 restore bounds.  If we have reason to think this is the case, then
+                // try to undo what WPF did after it has done its thing.
+                if (_hasUserMovedWindow)
+                {
+                    _hasUserMovedWindow = false;
+                    WINDOWPLACEMENT wp = NativeMethods.GetWindowPlacement(_hwnd);
+
+                    RECT adjustedDeviceRc = _GetAdjustedWindowRect(new RECT { Bottom = 100, Right = 100 });
+                    Point adjustedTopLeft = DpiHelper.DevicePixelsToLogical(
+                        new Point(
+                            wp.rcNormalPosition.Left - adjustedDeviceRc.Left,
+                            wp.rcNormalPosition.Top - adjustedDeviceRc.Top));
+
+                    _window.Top = adjustedTopLeft.Y;
+                    _window.Left = adjustedTopLeft.X;
+                }
+            }
+        }
+
+        private RECT _GetAdjustedWindowRect(RECT rcWindow)
+        {
+            // This should only be used to work around issues in the Framework that were fixed in 4.0
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            var style = (WS)NativeMethods.GetWindowLongPtr(_hwnd, GWL.STYLE);
+            var exstyle = (WS_EX)NativeMethods.GetWindowLongPtr(_hwnd, GWL.EXSTYLE);
+
+            return NativeMethods.AdjustWindowRectEx(rcWindow, style, false, exstyle);
+        }
+
+        // Windows tries hard to hide this state from applications.
+        // Generally you can tell that the window is in a docked position because the restore bounds from GetWindowPlacement
+        // don't match the current window location and it's not in a maximized or minimized state.
+        // Because this isn't doced or supported, it's also not incredibly consistent.  Sometimes some things get updated in
+        // different orders, so this isn't absolutely reliable.
+        private bool _IsWindowDocked
+        {
+            get
+            {
+                // We're only detecting this state to work around .Net 3.5 issues.
+                // This logic won't work correctly when those issues are fixed.
+                Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+                if (_window.WindowState != WindowState.Normal)
+                {
+                    return false;
+                }
+
+                RECT adjustedOffset = _GetAdjustedWindowRect(new RECT { Bottom = 100, Right = 100 });
+                Point windowTopLeft = new Point(_window.Left, _window.Top);
+                windowTopLeft -= (Vector)DpiHelper.DevicePixelsToLogical(new Point(adjustedOffset.Left, adjustedOffset.Top));
+
+                return _window.RestoreBounds.Location != windowTopLeft;
+            }
+        }
+
+        #region WindowProc and Message Handlers
+
+        private IntPtr _WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
+        {
+            // Only expecting messages for our cached HWND.
+            Assert.AreEqual(hwnd, _hwnd);
+
+            var message = (WM)msg;
+            foreach (var handlePair in _messageTable)
+            {
+                if (handlePair.Key == message)
+                {
+                    return handlePair.Value(message, wParam, lParam, out handled);
+                }
+            }
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleSetTextOrIcon(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            bool modified = _ModifyStyle(WS.VISIBLE, 0);
+
+            // Setting the caption text and icon cause Windows to redraw the caption.
+            // Letting the default WndProc handle the message without the WS_VISIBLE
+            // style applied bypasses the redraw.
+            IntPtr lRet = NativeMethods.DefWindowProc(_hwnd, uMsg, wParam, lParam);
+
+            // Put back the style we removed.
+            if (modified)
+            {
+                _ModifyStyle(0, WS.VISIBLE);
+            }
+            handled = true;
+            return lRet;
+        }
+
+        private IntPtr _HandleNCActivate(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // Despite MSDN's documentation of lParam not being used,
+            // calling DefWindowProc with lParam set to -1 causes Windows not to draw over the caption.
+
+            // Directly call DefWindowProc with a custom parameter
+            // which bypasses any other handling of the message.
+            IntPtr lRet = NativeMethods.DefWindowProc(_hwnd, WM.NCACTIVATE, wParam, new IntPtr(-1));
+            handled = true;
+            return lRet;
+        }
+
+        private IntPtr _HandleNCCalcSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // lParam is an [in, out] that can be either a RECT* (wParam == FALSE) or an NCCALCSIZE_PARAMS*.
+            // Since the first field of NCCALCSIZE_PARAMS is a RECT and is the only field we care about
+            // we can unconditionally treat it as a RECT.
+
+            // Since we always want the client size to equal the window size, we can unconditionally handle it
+            // without having to modify the parameters.
+
+            handled = true;
+            return new IntPtr((int)WVR.REDRAW);
+        }
+
+        private IntPtr _HandleNCHitTest(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            IntPtr lRet = IntPtr.Zero;
+            handled = false;
+
+            // Give DWM a chance at this first.
+            if (Utility.IsOSVistaOrNewer && _chromeInfo.GlassFrameThickness != default(Thickness) && _isGlassEnabled)
+            {
+                // If we're on Vista, give the DWM a chance to handle the message first.
+                handled = NativeMethods.DwmDefWindowProc(_hwnd, uMsg, wParam, lParam, out lRet);
+            }
+
+            // Handle letting the system know if we consider the mouse to be in our effective non-client area.
+            // If DWM already handled this by way of DwmDefWindowProc, then respect their call.
+            if (IntPtr.Zero == lRet)
+            {
+                var mousePosScreen = new Point(Utility.GET_X_LPARAM(lParam), Utility.GET_Y_LPARAM(lParam));
+                Rect windowPosition = _GetWindowRect();
+
+                HT ht = _HitTestNca(
+                    DpiHelper.DeviceRectToLogical(windowPosition),
+                    DpiHelper.DevicePixelsToLogical(mousePosScreen));
+
+                // Don't blindly respect HTCAPTION.
+                // We want UIElements in the caption area to be actionable so run through a hittest first.
+                if (ht != HT.CLIENT)
+                {
+                    Point mousePosWindow = mousePosScreen;
+                    mousePosWindow.Offset(-windowPosition.X, -windowPosition.Y);
+                    mousePosWindow = DpiHelper.DevicePixelsToLogical(mousePosWindow);
+                    IInputElement inputElement = _window.InputHitTest(mousePosWindow);
+                    if (inputElement != null && WindowChrome.GetIsHitTestVisibleInChrome(inputElement))
+                    {
+                        ht = HT.CLIENT;
+                    }
+                }
+                handled = true;
+                lRet = new IntPtr((int)ht);
+            }
+            return lRet;
+        }
+
+        private IntPtr _HandleNCRButtonUp(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // Emulate the system behavior of clicking the right mouse button over the caption area
+            // to bring up the system menu.
+            if (HT.CAPTION == (HT)wParam.ToInt32())
+            {
+                if (_window.ContextMenu != null)
+                {
+                    _window.ContextMenu.Placement = PlacementMode.MousePoint;
+                    _window.ContextMenu.IsOpen = true;
+                }
+                else if (WindowChrome.GetWindowChrome(_window).ShowSystemMenu)
+                    SystemCommands.ShowSystemMenuPhysicalCoordinates(_window, new Point(Utility.GET_X_LPARAM(lParam), Utility.GET_Y_LPARAM(lParam)));
+            }
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleSize(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            const int SIZE_MAXIMIZED = 2;
+
+            // Force when maximized.
+            // We can tell what's happening right now, but the Window doesn't yet know it's
+            // maximized.  Not forcing this update will eventually cause the
+            // default caption to be drawn.
+            WindowState? state = null;
+            if (wParam.ToInt32() == SIZE_MAXIMIZED)
+            {
+                state = WindowState.Maximized;
+            }
+            _UpdateSystemMenu(state);
+
+            // Still let the default WndProc handle this.
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleWindowPosChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // http://blogs.msdn.com/oldnewthing/archive/2008/01/15/7113860.aspx
+            // The WM_WINDOWPOSCHANGED message is sent at the end of the window
+            // state change process. It sort of combines the other state change
+            // notifications, WM_MOVE, WM_SIZE, and WM_SHOWWINDOW. But it doesn't
+            // suffer from the same limitations as WM_SHOWWINDOW, so you can
+            // reliably use it to react to the window being shown or hidden.
+
+            _UpdateSystemMenu(null);
+
+            if (!_isGlassEnabled)
+            {
+                Assert.IsNotDefault(lParam);
+                var wp = (WINDOWPOS)Marshal.PtrToStructure(lParam, typeof(WINDOWPOS));
+                _SetRoundingRegion(wp);
+            }
+
+            // Still want to pass this to DefWndProc
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleDwmCompositionChanged(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            _UpdateFrameState(false);
+
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleSettingChange(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // There are several settings that can cause fixups for the template to become invalid when changed.
+            // These shouldn't be required on the v4 framework.
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            _FixupFrameworkIssues();
+
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleEnterSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // This is only intercepted to deal with bugs in Window in .Net 3.5 and below.
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            _isUserResizing = true;
+
+            // On Win7 if the user is dragging the window out of the maximized state then we don't want to use that location
+            // as a restore point.
+            Assert.Implies(_window.WindowState == WindowState.Maximized, Utility.IsOSWindows7OrNewer);
+            if (_window.WindowState != WindowState.Maximized)
+            {
+                // Check for the docked window case.  The window can still be restored when it's in this position so 
+                // try to account for that and not update the start position.
+                if (!_IsWindowDocked)
+                {
+                    _windowPosAtStartOfUserMove = new Point(_window.Left, _window.Top);
+                }
+                // Realistically we also don't want to update the start position when moving from one docked state to another (or to and from maximized),
+                // but it's tricky to detect and this is already a workaround for a bug that's fixed in newer versions of the framework.
+                // Not going to try to handle all cases.
+            }
+
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleExitSizeMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // This is only intercepted to deal with bugs in Window in .Net 3.5 and below.
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            _isUserResizing = false;
+
+            // On Win7 the user can change the Window's state by dragging the window to the top of the monitor.
+            // If they did that, then we need to try to update the restore bounds or else WPF will put the window at the maximized location (e.g. (-8,-8)).
+            if (_window.WindowState == WindowState.Maximized)
+            {
+                Assert.IsTrue(Utility.IsOSWindows7OrNewer);
+                _window.Top = _windowPosAtStartOfUserMove.Y;
+                _window.Left = _windowPosAtStartOfUserMove.X;
+            }
+
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        private IntPtr _HandleMove(WM uMsg, IntPtr wParam, IntPtr lParam, out bool handled)
+        {
+            // This is only intercepted to deal with bugs in Window in .Net 3.5 and below.
+            Assert.IsTrue(Utility.IsPresentationFrameworkVersionLessThan4);
+
+            if (_isUserResizing)
+            {
+                _hasUserMovedWindow = true;
+            }
+
+            handled = false;
+            return IntPtr.Zero;
+        }
+
+        #endregion
+
+        /// <summary>Add and remove a native WindowStyle from the HWND.</summary>
+        /// <param name="removeStyle">The styles to be removed.  These can be bitwise combined.</param>
+        /// <param name="addStyle">The styles to be added.  These can be bitwise combined.</param>
+        /// <returns>Whether the styles of the HWND were modified as a result of this call.</returns>
+        private bool _ModifyStyle(WS removeStyle, WS addStyle)
+        {
+            Assert.IsNotDefault(_hwnd);
+            var dwStyle = (WS)NativeMethods.GetWindowLongPtr(_hwnd, GWL.STYLE).ToInt32();
+            var dwNewStyle = (dwStyle & ~removeStyle) | addStyle;
+            if (dwStyle == dwNewStyle)
+            {
+                return false;
+            }
+
+            NativeMethods.SetWindowLongPtr(_hwnd, GWL.STYLE, new IntPtr((int)dwNewStyle));
+            return true;
+        }
+
+        /// <summary>
+        /// Get the WindowState as the native HWND knows it to be.  This isn't necessarily the same as what Window thinks.
+        /// </summary>
+        private WindowState _GetHwndState()
+        {
+            var wpl = NativeMethods.GetWindowPlacement(_hwnd);
+            switch (wpl.showCmd)
+            {
+                case SW.SHOWMINIMIZED: return WindowState.Minimized;
+                case SW.SHOWMAXIMIZED: return WindowState.Maximized;
+            }
+            return WindowState.Normal;
+        }
+
+        /// <summary>
+        /// Get the bounding rectangle for the window in physical coordinates.
+        /// </summary>
+        /// <returns>The bounding rectangle for the window.</returns>
+        private Rect _GetWindowRect()
+        {
+            // Get the window rectangle.
+            RECT windowPosition = NativeMethods.GetWindowRect(_hwnd);
+            return new Rect(windowPosition.Left, windowPosition.Top, windowPosition.Width, windowPosition.Height);
+        }
+
+        /// <summary>
+        /// Update the items in the system menu based on the current, or assumed, WindowState.
+        /// </summary>
+        /// <param name="assumeState">
+        /// The state to assume that the Window is in.  This can be null to query the Window's state.
+        /// </param>
+        /// <remarks>
+        /// We want to update the menu while we have some control over whether the caption will be repainted.
+        /// </remarks>
+        private void _UpdateSystemMenu(WindowState? assumeState)
+        {
+            const MF mfEnabled = MF.ENABLED | MF.BYCOMMAND;
+            const MF mfDisabled = MF.GRAYED | MF.DISABLED | MF.BYCOMMAND;
+
+            WindowState state = assumeState ?? _GetHwndState();
+
+            if (null != assumeState || _lastMenuState != state)
+            {
+                _lastMenuState = state;
+
+                bool modified = _ModifyStyle(WS.VISIBLE, 0);
+                IntPtr hmenu = NativeMethods.GetSystemMenu(_hwnd, false);
+                if (IntPtr.Zero != hmenu)
+                {
+                    var dwStyle = (WS)NativeMethods.GetWindowLongPtr(_hwnd, GWL.STYLE).ToInt32();
+
+                    bool canMinimize = Utility.IsFlagSet((int)dwStyle, (int)WS.MINIMIZEBOX);
+                    bool canMaximize = Utility.IsFlagSet((int)dwStyle, (int)WS.MAXIMIZEBOX);
+                    bool canSize = Utility.IsFlagSet((int)dwStyle, (int)WS.THICKFRAME);
+
+                    switch (state)
+                    {
+                        case WindowState.Maximized:
+                            NativeMethods.EnableMenuItem(hmenu, SC.RESTORE, mfEnabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MOVE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.SIZE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MINIMIZE, canMinimize ? mfEnabled : mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MAXIMIZE, mfDisabled);
+                            break;
+                        case WindowState.Minimized:
+                            NativeMethods.EnableMenuItem(hmenu, SC.RESTORE, mfEnabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MOVE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.SIZE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MINIMIZE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MAXIMIZE, canMaximize ? mfEnabled : mfDisabled);
+                            break;
+                        default:
+                            NativeMethods.EnableMenuItem(hmenu, SC.RESTORE, mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MOVE, mfEnabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.SIZE, canSize ? mfEnabled : mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MINIMIZE, canMinimize ? mfEnabled : mfDisabled);
+                            NativeMethods.EnableMenuItem(hmenu, SC.MAXIMIZE, canMaximize ? mfEnabled : mfDisabled);
+                            break;
+                    }
+                }
+
+                if (modified)
+                {
+                    _ModifyStyle(0, WS.VISIBLE);
+                }
+            }
+        }
+
+        private void _UpdateFrameState(bool force)
+        {
+            if (IntPtr.Zero == _hwnd)
+            {
+                return;
+            }
+
+            // Don't rely on SystemParameters2 for this, just make the check ourselves.
+            bool frameState = NativeMethods.DwmIsCompositionEnabled();
+
+            if (force || frameState != _isGlassEnabled)
+            {
+                _isGlassEnabled = frameState && _chromeInfo.GlassFrameThickness != default(Thickness);
+
+                if (!_isGlassEnabled)
+                {
+                    _SetRoundingRegion(null);
+                }
+                else
+                {
+                    _ClearRoundingRegion();
+                    _ExtendGlassFrame();
+
+                    _FixupWindows7Issues();
+                }
+
+                NativeMethods.SetWindowPos(_hwnd, IntPtr.Zero, 0, 0, 0, 0, _SwpFlags);
+            }
+        }
+
+        private void _ClearRoundingRegion()
+        {
+            NativeMethods.SetWindowRgn(_hwnd, IntPtr.Zero, NativeMethods.IsWindowVisible(_hwnd));
+        }
+
+        private void _SetRoundingRegion(WINDOWPOS? wp)
+        {
+            const int MONITOR_DEFAULTTONEAREST = 0x00000002;
+
+            // We're early - WPF hasn't necessarily updated the state of the window.
+            // Need to query it ourselves.
+            WINDOWPLACEMENT wpl = NativeMethods.GetWindowPlacement(_hwnd);
+
+            if (wpl.showCmd == SW.SHOWMAXIMIZED)
+            {
+                int left;
+                int top;
+
+                if (wp.HasValue)
+                {
+                    left = wp.Value.x;
+                    top = wp.Value.y;
+                }
+                else
+                {
+                    Rect r = _GetWindowRect();
+                    left = (int)r.Left;
+                    top = (int)r.Top;
+                }
+
+                IntPtr hMon = NativeMethods.MonitorFromWindow(_hwnd, MONITOR_DEFAULTTONEAREST);
+
+                MONITORINFO mi = NativeMethods.GetMonitorInfo(hMon);
+                RECT rcMax = mi.rcWork;
+                // The location of maximized window takes into account the border that Windows was
+                // going to remove, so we also need to consider it.
+                rcMax.Offset(-left, -top);
+
+                IntPtr hrgn = IntPtr.Zero;
+                try
+                {
+                    hrgn = NativeMethods.CreateRectRgnIndirect(rcMax);
+                    NativeMethods.SetWindowRgn(_hwnd, hrgn, NativeMethods.IsWindowVisible(_hwnd));
+                    hrgn = IntPtr.Zero;
+                }
+                finally
+                {
+                    Utility.SafeDeleteObject(ref hrgn);
+                }
+            }
+            else
+            {
+                Size windowSize;
+
+                // Use the size if it's specified.
+                if (null != wp && !Utility.IsFlagSet(wp.Value.flags, (int)SWP.NOSIZE))
+                {
+                    windowSize = new Size((double)wp.Value.cx, (double)wp.Value.cy);
+                }
+                else if (null != wp && (_lastRoundingState == _window.WindowState))
+                {
+                    return;
+                }
+                else
+                {
+                    windowSize = _GetWindowRect().Size;
+                }
+
+                _lastRoundingState = _window.WindowState;
+
+                IntPtr hrgn = IntPtr.Zero;
+                try
+                {
+                    double shortestDimension = Math.Min(windowSize.Width, windowSize.Height);
+
+                    double topLeftRadius = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.CornerRadius.TopLeft, 0)).X;
+                    topLeftRadius = Math.Min(topLeftRadius, shortestDimension / 2);
+
+                    if (_IsUniform(_chromeInfo.CornerRadius))
+                    {
+                        // RoundedRect HRGNs require an additional pixel of padding.
+                        hrgn = _CreateRoundRectRgn(new Rect(windowSize), topLeftRadius);
+                    }
+                    else
+                    {
+                        // We need to combine HRGNs for each of the corners.
+                        // Create one for each quadrant, but let it overlap into the two adjacent ones
+                        // by the radius amount to ensure that there aren't corners etched into the middle
+                        // of the window.
+                        hrgn = _CreateRoundRectRgn(new Rect(0, 0, windowSize.Width / 2 + topLeftRadius, windowSize.Height / 2 + topLeftRadius), topLeftRadius);
+
+                        double topRightRadius = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.CornerRadius.TopRight, 0)).X;
+                        topRightRadius = Math.Min(topRightRadius, shortestDimension / 2);
+                        Rect topRightRegionRect = new Rect(0, 0, windowSize.Width / 2 + topRightRadius, windowSize.Height / 2 + topRightRadius);
+                        topRightRegionRect.Offset(windowSize.Width / 2 - topRightRadius, 0);
+                        Assert.AreEqual(topRightRegionRect.Right, windowSize.Width);
+
+                        _CreateAndCombineRoundRectRgn(hrgn, topRightRegionRect, topRightRadius);
+
+                        double bottomLeftRadius = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.CornerRadius.BottomLeft, 0)).X;
+                        bottomLeftRadius = Math.Min(bottomLeftRadius, shortestDimension / 2);
+                        Rect bottomLeftRegionRect = new Rect(0, 0, windowSize.Width / 2 + bottomLeftRadius, windowSize.Height / 2 + bottomLeftRadius);
+                        bottomLeftRegionRect.Offset(0, windowSize.Height / 2 - bottomLeftRadius);
+                        Assert.AreEqual(bottomLeftRegionRect.Bottom, windowSize.Height);
+
+                        _CreateAndCombineRoundRectRgn(hrgn, bottomLeftRegionRect, bottomLeftRadius);
+
+                        double bottomRightRadius = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.CornerRadius.BottomRight, 0)).X;
+                        bottomRightRadius = Math.Min(bottomRightRadius, shortestDimension / 2);
+                        Rect bottomRightRegionRect = new Rect(0, 0, windowSize.Width / 2 + bottomRightRadius, windowSize.Height / 2 + bottomRightRadius);
+                        bottomRightRegionRect.Offset(windowSize.Width / 2 - bottomRightRadius, windowSize.Height / 2 - bottomRightRadius);
+                        Assert.AreEqual(bottomRightRegionRect.Right, windowSize.Width);
+                        Assert.AreEqual(bottomRightRegionRect.Bottom, windowSize.Height);
+
+                        _CreateAndCombineRoundRectRgn(hrgn, bottomRightRegionRect, bottomRightRadius);
+                    }
+
+                    NativeMethods.SetWindowRgn(_hwnd, hrgn, NativeMethods.IsWindowVisible(_hwnd));
+                    hrgn = IntPtr.Zero;
+                }
+                finally
+                {
+                    // Free the memory associated with the HRGN if it wasn't assigned to the HWND.
+                    Utility.SafeDeleteObject(ref hrgn);
+                }
+            }
+        }
+
+        private static IntPtr _CreateRoundRectRgn(Rect region, double radius)
+        {
+            // Round outwards.
+
+            if (DoubleUtilities.AreClose(0, radius))
+            {
+                return NativeMethods.CreateRectRgn(
+                    (int)Math.Floor(region.Left),
+                    (int)Math.Floor(region.Top), 
+                    (int)Math.Ceiling(region.Right), 
+                    (int)Math.Ceiling(region.Bottom));
+            }
+
+            // RoundedRect HRGNs require an additional pixel of padding on the bottom right to look correct.
+            return NativeMethods.CreateRoundRectRgn(
+                (int)Math.Floor(region.Left),
+                (int)Math.Floor(region.Top), 
+                (int)Math.Ceiling(region.Right) + 1, 
+                (int)Math.Ceiling(region.Bottom) + 1,
+                (int)Math.Ceiling(radius), 
+                (int)Math.Ceiling(radius));
+        }
+
+        [SuppressMessage("Microsoft.Naming", "CA2204:Literals should be spelled correctly", MessageId = "HRGNs")]
+        private static void _CreateAndCombineRoundRectRgn(IntPtr hrgnSource, Rect region, double radius)
+        {
+            IntPtr hrgn = IntPtr.Zero;
+            try
+            {
+                hrgn = _CreateRoundRectRgn(region, radius);
+                CombineRgnResult result = NativeMethods.CombineRgn(hrgnSource, hrgnSource, hrgn, RGN.OR);
+                if (result == CombineRgnResult.ERROR)
+                {
+                    throw new InvalidOperationException("Unable to combine two HRGNs.");
+                }
+            }
+            catch
+            {
+                Utility.SafeDeleteObject(ref hrgn);
+                throw;
+            }
+        }
+
+        private static bool _IsUniform(CornerRadius cornerRadius)
+        {
+            if (!DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.BottomRight))
+            {
+                return false;
+            }
+
+            if (!DoubleUtilities.AreClose(cornerRadius.TopLeft, cornerRadius.TopRight))
+            {
+                return false;
+            }
+
+            if (!DoubleUtilities.AreClose(cornerRadius.BottomLeft, cornerRadius.TopRight))
+            {
+                return false;
+            }
+
+            return true;
+        }
+
+        private void _ExtendGlassFrame()
+        {
+            Assert.IsNotNull(_window);
+
+            // Expect that this might be called on OSes other than Vista.
+            if (!Utility.IsOSVistaOrNewer)
+            {
+                // Not an error.  Just not on Vista so we're not going to get glass.
+                return;
+            }
+
+            if (IntPtr.Zero == _hwnd)
+            {
+                // Can't do anything with this call until the Window has been shown.
+                return;
+            }
+
+            // Ensure standard HWND background painting when DWM isn't enabled.
+            if (!NativeMethods.DwmIsCompositionEnabled())
+            {
+                _hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
+            }
+            else
+            {
+                // This makes the glass visible at a Win32 level so long as nothing else is covering it.
+                // The Window's Background needs to be changed independent of this.
+
+                // Apply the transparent background to the HWND
+                _hwndSource.CompositionTarget.BackgroundColor = Colors.Transparent;
+
+                // Thickness is going to be DIPs, need to convert to system coordinates.
+                Point deviceTopLeft = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.GlassFrameThickness.Left, _chromeInfo.GlassFrameThickness.Top));
+                Point deviceBottomRight = DpiHelper.LogicalPixelsToDevice(new Point(_chromeInfo.GlassFrameThickness.Right, _chromeInfo.GlassFrameThickness.Bottom));
+
+                var dwmMargin = new MARGINS
+                {
+                    // err on the side of pushing in glass an extra pixel.
+                    cxLeftWidth = (int)Math.Ceiling(deviceTopLeft.X),
+                    cxRightWidth = (int)Math.Ceiling(deviceBottomRight.X),
+                    cyTopHeight = (int)Math.Ceiling(deviceTopLeft.Y),
+                    cyBottomHeight = (int)Math.Ceiling(deviceBottomRight.Y),
+                };
+
+                NativeMethods.DwmExtendFrameIntoClientArea(_hwnd, ref dwmMargin);
+            }
+        }
+
+        /// <summary>
+        /// Matrix of the HT values to return when responding to NC window messages.
+        /// </summary>
+        [SuppressMessage("Microsoft.Performance", "CA1814:PreferJaggedArraysOverMultidimensional", MessageId = "Member")]
+        private static readonly HT[,] _HitTestBorders = new[,]
+        {
+            { HT.TOPLEFT,    HT.TOP,     HT.TOPRIGHT    },
+            { HT.LEFT,       HT.CLIENT,  HT.RIGHT       },
+            { HT.BOTTOMLEFT, HT.BOTTOM,  HT.BOTTOMRIGHT },
+        };
+
+        private HT _HitTestNca(Rect windowPosition, Point mousePosition)
+        {
+            // Determine if hit test is for resizing, default middle (1,1).
+            int uRow = 1;
+            int uCol = 1;
+            bool onResizeBorder = false;
+
+            // Determine if the point is at the top or bottom of the window.
+            if (mousePosition.Y >= windowPosition.Top && mousePosition.Y < windowPosition.Top + _chromeInfo.ResizeBorderThickness.Top + _chromeInfo.CaptionHeight)
+            {
+                onResizeBorder = (mousePosition.Y < (windowPosition.Top + _chromeInfo.ResizeBorderThickness.Top));
+                uRow = 0; // top (caption or resize border)
+            }
+            else if (mousePosition.Y < windowPosition.Bottom && mousePosition.Y >= windowPosition.Bottom - (int)_chromeInfo.ResizeBorderThickness.Bottom)
+            {
+                uRow = 2; // bottom
+            }
+
+            // Determine if the point is at the left or right of the window.
+            if (mousePosition.X >= windowPosition.Left && mousePosition.X < windowPosition.Left + (int)_chromeInfo.ResizeBorderThickness.Left)
+            {
+                uCol = 0; // left side
+            }
+            else if (mousePosition.X < windowPosition.Right && mousePosition.X >= windowPosition.Right - _chromeInfo.ResizeBorderThickness.Right)
+            {
+                uCol = 2; // right side
+            }
+
+            // If the cursor is in one of the top edges by the caption bar, but below the top resize border,
+            // then resize left-right rather than diagonally.
+            if (uRow == 0 && uCol != 1 && !onResizeBorder)
+            {
+                uRow = 1;
+            }
+
+            HT ht = _HitTestBorders[uRow, uCol];
+
+            if (ht == HT.TOP && !onResizeBorder)
+            {
+                ht = HT.CAPTION;
+            }
+
+            return ht;
+        }
+
+        #region Remove Custom Chrome Methods
+
+        private void _RestoreStandardChromeState(bool isClosing)
+        {
+            VerifyAccess();
+
+            _UnhookCustomChrome();
+
+            if (!isClosing)
+            {
+                _RestoreFrameworkIssueFixups();
+                _RestoreGlassFrame();
+                _RestoreHrgn();
+
+                _window.InvalidateMeasure();
+            }
+        }
+
+        private void _UnhookCustomChrome()
+        {
+            Assert.IsNotDefault(_hwnd);
+            Assert.IsNotNull(_window);
+
+            if (_isHooked)
+            {
+                _hwndSource.RemoveHook(_WndProc);
+                _isHooked = false;
+            }
+        }
+
+        private void _RestoreFrameworkIssueFixups()
+        {
+            // This margin is only necessary if the client rect is going to be calculated incorrectly by WPF.
+            // This bug was fixed in V4 of the framework.
+            if (Utility.IsPresentationFrameworkVersionLessThan4)
+            {
+                Assert.IsTrue(_isFixedUp);
+
+                var rootElement = (FrameworkElement)VisualTreeHelper.GetChild(_window, 0);
+                // Undo anything that was done before.
+                rootElement.Margin = new Thickness();
+
+                _window.StateChanged -= _FixupRestoreBounds;
+                _isFixedUp = false;
+            }
+        }
+
+        private void _RestoreGlassFrame()
+        {
+            Assert.IsNull(_chromeInfo);
+            Assert.IsNotNull(_window);
+
+            // Expect that this might be called on OSes other than Vista
+            // and if the window hasn't yet been shown, then we don't need to undo anything.
+            if (!Utility.IsOSVistaOrNewer || _hwnd == IntPtr.Zero)
+            {
+                return;
+            }
+
+            _hwndSource.CompositionTarget.BackgroundColor = SystemColors.WindowColor;
+
+            if (NativeMethods.DwmIsCompositionEnabled())
+            {
+                // If glass is enabled, push it back to the normal bounds.
+                var dwmMargin = new MARGINS();
+                NativeMethods.DwmExtendFrameIntoClientArea(_hwnd, ref dwmMargin);
+            }
+        }
+
+        private void _RestoreHrgn()
+        {
+            _ClearRoundingRegion();
+            NativeMethods.SetWindowPos(_hwnd, IntPtr.Zero, 0, 0, 0, 0, _SwpFlags);
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
new file mode 100644
index 000000000..71c80b99f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
@@ -0,0 +1,126 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    internal static class TransformExtensions
+    {
+        public static Point PointToScreenDPI(this Visual visual, Point pt)
+        {
+            Point resultPt = visual.PointToScreen(pt);
+            return TransformToDeviceDPI(visual, resultPt);
+        }
+
+        public static Point PointToScreenDPIWithoutFlowDirection(this FrameworkElement element, Point point)
+        {
+            if (FrameworkElement.GetFlowDirection(element) == FlowDirection.RightToLeft)
+            {
+                var actualSize = element.TransformActualSizeToAncestor();
+                Point leftToRightPoint = new Point(
+                    actualSize.Width - point.X,
+                    point.Y);
+                return element.PointToScreenDPI(leftToRightPoint);
+            }
+
+            return element.PointToScreenDPI(point);
+        }
+
+
+
+        public static Rect GetScreenArea(this FrameworkElement element)
+        {
+        //    return new Rect(element.PointToScreenDPI(new Point()),
+        //        element.TransformActualSizeToAncestor());
+        //}
+
+        //public static Rect GetScreenAreaWithoutFlowDirection(this FrameworkElement element)
+        //{
+            var point = element.PointToScreenDPI(new Point());
+            if (FrameworkElement.GetFlowDirection(element) == FlowDirection.RightToLeft)
+            {
+                var actualSize = element.TransformActualSizeToAncestor();
+                Point leftToRightPoint = new Point(
+                    actualSize.Width - point.X,
+                    point.Y);
+                return new Rect(leftToRightPoint,
+                    actualSize);
+            }
+
+            return new Rect(point,
+                element.TransformActualSizeToAncestor());
+        }
+
+        public static Point TransformToDeviceDPI(this Visual visual, Point pt)
+        {
+            Matrix m = PresentationSource.FromVisual(visual).CompositionTarget.TransformToDevice;
+            return new Point(pt.X / m.M11, pt.Y / m.M22);
+        }
+
+        public static Size TransformFromDeviceDPI(this Visual visual, Size size)
+        {
+            Matrix m = PresentationSource.FromVisual(visual).CompositionTarget.TransformToDevice;
+            return new Size(size.Width * m.M11, size.Height * m.M22);
+        }
+
+        public static Point TransformFromDeviceDPI(this Visual visual, Point pt)
+        {
+            Matrix m = PresentationSource.FromVisual(visual).CompositionTarget.TransformToDevice;
+            return new Point(pt.X * m.M11, pt.Y * m.M22);
+        }
+
+        public static bool CanTransform(this Visual visual)
+        {
+            return PresentationSource.FromVisual(visual) != null;
+        }
+
+        public static Size TransformActualSizeToAncestor(this FrameworkElement element)
+        {
+            if (PresentationSource.FromVisual(element) == null)
+                return new Size(element.ActualWidth, element.ActualHeight);
+
+            var parentWindow = PresentationSource.FromVisual(element).RootVisual;
+            var transformToWindow = element.TransformToAncestor(parentWindow);
+            return transformToWindow.TransformBounds(new Rect(0, 0, element.ActualWidth, element.ActualHeight)).Size;
+        }
+
+        public static Size TransformSizeToAncestor(this FrameworkElement element, Size sizeToTransform)
+        {
+            if (PresentationSource.FromVisual(element) == null)
+                return sizeToTransform;
+
+            var parentWindow = PresentationSource.FromVisual(element).RootVisual;
+            var transformToWindow = element.TransformToAncestor(parentWindow);
+            return transformToWindow.TransformBounds(new Rect(0, 0, sizeToTransform.Width, sizeToTransform.Height)).Size;
+        }
+
+        public static GeneralTransform TansformToAncestor(this FrameworkElement element)
+        {
+            if (PresentationSource.FromVisual(element) == null)
+                return new MatrixTransform(Matrix.Identity);
+
+            var parentWindow = PresentationSource.FromVisual(element).RootVisual;
+            return element.TransformToAncestor(parentWindow);
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
new file mode 100644
index 000000000..b87cbc7c6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
@@ -0,0 +1,94 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class WeakDictionary<K,V> where K : class
+    {
+        public WeakDictionary()
+        {}
+
+        List<WeakReference> _keys = new List<WeakReference>();
+        List<V> _values = new List<V>();
+
+        public V this[K key]
+        {
+            get
+            {
+                V valueToReturn;
+                if (!GetValue(key, out valueToReturn))
+                    throw new ArgumentException();
+                return valueToReturn;
+            }
+            set
+            {
+                SetValue(key, value);
+            }
+        }
+
+        public bool ContainsKey(K key)
+        {
+            CollectGarbage();
+            return -1 != _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+        }
+
+        public void SetValue(K key, V value)
+        {
+            CollectGarbage();
+            int vIndex = _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+            if (vIndex > -1)
+                _values[vIndex] = value;
+            else
+            {
+                _values.Add(value);
+                _keys.Add(new WeakReference(key));
+            }            
+        }
+
+        public bool GetValue(K key, out V value)
+        {
+            CollectGarbage();
+            int vIndex = _keys.FindIndex(k => k.GetValueOrDefault<K>() == key);
+            value = default(V);
+            if (vIndex == -1)
+                return false;
+            value = _values[vIndex];
+            return true;
+        }
+
+
+        void CollectGarbage()
+        { 
+            int vIndex = 0; 
+
+            do
+            { 
+                vIndex = _keys.FindIndex(vIndex, k => !k.IsAlive);
+                if (vIndex >= 0)
+                {
+                    _keys.RemoveAt(vIndex);
+                    _values.RemoveAt(vIndex);
+                }
+            }
+            while (vIndex >= 0);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
new file mode 100644
index 000000000..c435cdec3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
@@ -0,0 +1,37 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class WindowActivateEventArgs : EventArgs
+    {
+        public WindowActivateEventArgs(IntPtr hwndActivating)
+        {
+            HwndActivating = hwndActivating;
+        }
+
+        public IntPtr HwndActivating
+        {
+            get;
+            private set;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
new file mode 100644
index 000000000..eb07e409f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
@@ -0,0 +1,99 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+
+namespace Xceed.Wpf.AvalonDock.Controls
+{
+    class FocusChangeEventArgs : EventArgs
+    {
+        public FocusChangeEventArgs(IntPtr gotFocusWinHandle, IntPtr lostFocusWinHandle)
+        {
+            GotFocusWinHandle = gotFocusWinHandle;
+            LostFocusWinHandle = lostFocusWinHandle;
+        }
+
+        public IntPtr GotFocusWinHandle
+        {
+            get;
+            private set;
+        }
+        public IntPtr LostFocusWinHandle
+        {
+            get;
+            private set;
+        }
+    }
+
+    class WindowHookHandler
+    {
+        public WindowHookHandler()
+        { 
+
+        }
+
+        IntPtr _windowHook;
+        Win32Helper.HookProc _hookProc;
+        public void Attach()
+        {
+            _hookProc = new Win32Helper.HookProc(this.HookProc);
+            _windowHook = Win32Helper.SetWindowsHookEx(
+                Win32Helper.HookType.WH_CBT,
+                _hookProc,
+                IntPtr.Zero,
+                (int)Win32Helper.GetCurrentThreadId());
+        }
+
+
+        public void Detach()
+        {
+            Win32Helper.UnhookWindowsHookEx(_windowHook);
+        }   
+
+        public int HookProc(int code, IntPtr wParam, IntPtr lParam)
+        {
+            if (code == Win32Helper.HCBT_SETFOCUS)
+            {
+                if (FocusChanged != null)
+                    FocusChanged(this, new FocusChangeEventArgs(wParam, lParam));
+            }
+            else if (code == Win32Helper.HCBT_ACTIVATE)
+            {
+                if (_insideActivateEvent.CanEnter)
+                {
+                    using (_insideActivateEvent.Enter())
+                    {
+                        //if (Activate != null)
+                        //    Activate(this, new WindowActivateEventArgs(wParam));
+                    }
+                }
+            }
+
+
+            return Win32Helper.CallNextHookEx(_windowHook, code, wParam, lParam);
+        }
+
+        public event EventHandler<FocusChangeEventArgs> FocusChanged;
+
+        //public event EventHandler<WindowActivateEventArgs> Activate;
+
+        ReentrantFlag _insideActivateEvent = new ReentrantFlag();
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
new file mode 100644
index 000000000..01887b1bc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
@@ -0,0 +1,51 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class ActivateCommandLayoutItemFromLayoutModelConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            //when this converter is called layout could be constructing so many properties here are potentially not valid
+            var layoutModel = value as LayoutContent;
+            if (layoutModel == null)
+                return null;
+            if (layoutModel.Root == null)
+                return null;
+            if (layoutModel.Root.Manager == null)
+                return null;
+
+            var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
+            if (layoutItemModel == null)
+                return Binding.DoNothing;
+
+            return layoutItemModel.ActivateCommand;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
new file mode 100644
index 000000000..1282a1022
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
@@ -0,0 +1,44 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    [ValueConversion(typeof(AnchorSide), typeof(double))]
+    public class AnchorSideToAngleConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            AnchorSide side = (AnchorSide)value;
+            if (side == AnchorSide.Left ||
+                side == AnchorSide.Right)
+                return 90.0;
+
+            return Binding.DoNothing;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
new file mode 100644
index 000000000..8ab707cb0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
@@ -0,0 +1,45 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Controls;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    [ValueConversion(typeof(AnchorSide), typeof(Orientation))] 
+    public class AnchorSideToOrientationConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            AnchorSide side = (AnchorSide)value;
+            if (side == AnchorSide.Left ||
+                side == AnchorSide.Right)
+                return Orientation.Vertical;
+
+            return Orientation.Horizontal;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
new file mode 100644
index 000000000..ca89470f0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+using Xceed.Wpf.AvalonDock.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class AutoHideCommandLayoutItemFromLayoutModelConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            //when this converter is called layout could be constructing so many properties here are potentially not valid
+            var layoutModel = value as LayoutContent;
+            if (layoutModel == null)
+                return null;
+            if (layoutModel.Root == null)
+                return null;
+            if (layoutModel.Root.Manager == null)
+                return null;
+
+            var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) as LayoutAnchorableItem;
+            if (layoutItemModel == null)
+                return Binding.DoNothing;
+
+            return layoutItemModel.AutoHideCommand;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
new file mode 100644
index 000000000..b93e66c78
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
@@ -0,0 +1,92 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    [ValueConversion(typeof(bool), typeof(Visibility))] 
+    public class BoolToVisibilityConverter : IValueConverter 
+    { 
+
+        #region IValueConverter Members 
+        /// <summary> 
+        /// Converts a value. 
+        /// </summary> 
+        /// <param name="value">The value produced by the binding source.</param> 
+        /// <param name="targetType">The type of the binding target property.</param> 
+        /// <param name="parameter">The converter parameter to use.</param> 
+        /// <param name="culture">The culture to use in the converter.</param> 
+        /// <returns> 
+        /// A converted value. If the method returns null, the valid null value is used. 
+        /// </returns> 
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value is bool && targetType == typeof(Visibility))
+            {
+                bool val = (bool)value;
+                if (val)
+                    return Visibility.Visible;
+                else
+                    if (parameter != null && parameter is Visibility)
+                        return parameter;
+                    else
+                        return Visibility.Collapsed;
+            }
+            if (value == null)
+            {
+                if (parameter != null && parameter is Visibility)
+                    return parameter;
+                else
+                    return Visibility.Collapsed;
+            }
+
+            return Visibility.Visible;
+            ///throw new ArgumentException("Invalid argument/return type. Expected argument: bool and return type: Visibility");
+        }
+
+        /// <summary> 
+        /// Converts a value. 
+        /// </summary> 
+        /// <param name="value">The value that is produced by the binding target.</param> 
+        /// <param name="targetType">The type to convert to.</param> 
+        /// <param name="parameter">The converter parameter to use.</param> 
+        /// <param name="culture">The culture to use in the converter.</param> 
+        /// <returns> 
+        /// A converted value. If the method returns null, the valid null value is used. 
+        /// </returns> 
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) 
+        { 
+                if (value is Visibility && targetType == typeof(bool)) 
+                { 
+                        Visibility val = (Visibility)value; 
+                        if (val == Visibility.Visible) 
+                                return true; 
+                        else 
+                                return false; 
+                } 
+                throw new ArgumentException("Invalid argument/return type. Expected argument: Visibility and return type: bool"); 
+        } 
+        #endregion 
+    } 
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
new file mode 100644
index 000000000..d2207b145
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+using Xceed.Wpf.AvalonDock.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class HideCommandLayoutItemFromLayoutModelConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            //when this converter is called layout could be constructing so many properties here are potentially not valid
+            var layoutModel = value as LayoutContent;
+            if (layoutModel == null)
+                return null;
+            if (layoutModel.Root == null)
+                return null;
+            if (layoutModel.Root.Manager == null)
+                return null;
+
+            var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel) as LayoutAnchorableItem;
+            if (layoutItemModel == null)
+                return Binding.DoNothing;
+
+            return layoutItemModel.HideCommand;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
new file mode 100644
index 000000000..3dd40ef94
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
@@ -0,0 +1,83 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    [ValueConversion(typeof(bool), typeof(Visibility))] 
+    public class InverseBoolToVisibilityConverter : IValueConverter 
+    { 
+
+        #region IValueConverter Members 
+        /// <summary> 
+        /// Converts a value. 
+        /// </summary> 
+        /// <param name="value">The value produced by the binding source.</param> 
+        /// <param name="targetType">The type of the binding target property.</param> 
+        /// <param name="parameter">The converter parameter to use.</param> 
+        /// <param name="culture">The culture to use in the converter.</param> 
+        /// <returns> 
+        /// A converted value. If the method returns null, the valid null value is used. 
+        /// </returns> 
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) 
+        { 
+                if (value is bool && targetType == typeof(Visibility)) 
+                { 
+                        bool val = !(bool)value; 
+                        if (val) 
+                                return Visibility.Visible; 
+                        else 
+                                if (parameter != null && parameter is Visibility ) 
+                                        return parameter; 
+                                else 
+                                        return Visibility.Collapsed; 
+                } 
+                throw new ArgumentException("Invalid argument/return type. Expected argument: bool and return type: Visibility"); 
+        } 
+
+        /// <summary> 
+        /// Converts a value. 
+        /// </summary> 
+        /// <param name="value">The value that is produced by the binding target.</param> 
+        /// <param name="targetType">The type to convert to.</param> 
+        /// <param name="parameter">The converter parameter to use.</param> 
+        /// <param name="culture">The culture to use in the converter.</param> 
+        /// <returns> 
+        /// A converted value. If the method returns null, the valid null value is used. 
+        /// </returns> 
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) 
+        { 
+                if (value is Visibility && targetType == typeof(bool)) 
+                { 
+                        Visibility val = (Visibility)value; 
+                        if (val == Visibility.Visible) 
+                                return false; 
+                        else 
+                                return true; 
+                } 
+                throw new ArgumentException("Invalid argument/return type. Expected argument: Visibility and return type: bool"); 
+        } 
+        #endregion 
+    } 
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
new file mode 100644
index 000000000..d80e342ec
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
@@ -0,0 +1,50 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class LayoutItemFromLayoutModelConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            var layoutModel = value as LayoutContent;
+            if (layoutModel == null)
+                return null;
+            if (layoutModel.Root == null)
+                return null;
+            if (layoutModel.Root.Manager == null)
+                return null;
+
+            var layoutItemModel = layoutModel.Root.Manager.GetLayoutItemFromModel(layoutModel);
+            if (layoutItemModel == null)
+                return Binding.DoNothing;
+
+            return layoutItemModel;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
new file mode 100644
index 000000000..2fb9fa912
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
@@ -0,0 +1,40 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class NullToDoNothingConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value == null)
+                return Binding.DoNothing;
+
+            return value;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
new file mode 100644
index 000000000..7f076bfb3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
@@ -0,0 +1,42 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Media.Imaging;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Converters
+{
+    public class UriSourceToBitmapImageConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            if (value == null)
+                return Binding.DoNothing;
+            //return (Uri)value;
+            return new Image() { Source = new BitmapImage((Uri)value) } ;
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
new file mode 100644
index 000000000..e05af9846
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
@@ -0,0 +1,3210 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Markup;
+using System.ComponentModel;
+using System.Windows.Interop;
+using System.Diagnostics;
+
+using Xceed.Wpf.AvalonDock.Layout;
+using Xceed.Wpf.AvalonDock.Controls;
+using System.Windows.Input;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Windows.Data;
+using System.Windows.Threading;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Themes;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    [ContentProperty("Layout")]
+    [TemplatePart(Name="PART_AutoHideArea")]
+    public class DockingManager : Control, IOverlayWindowHost//, ILogicalChildrenContainer
+    {
+        static DockingManager()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(typeof(DockingManager)));
+            FocusableProperty.OverrideMetadata(typeof(DockingManager), new FrameworkPropertyMetadata(false));
+            HwndSource.DefaultAcquireHwndFocusInMenuMode = false;
+        }
+
+
+        public DockingManager()
+        {
+            Layout = new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+
+
+            this.Loaded += new RoutedEventHandler(DockingManager_Loaded);
+            this.Unloaded += new RoutedEventHandler(DockingManager_Unloaded);
+        }
+
+        #region Layout
+
+        /// <summary>
+        /// Layout Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutProperty =
+            DependencyProperty.Register("Layout", typeof(LayoutRoot), typeof(DockingManager),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnLayoutChanged),
+                    new CoerceValueCallback(CoerceLayoutValue)));
+
+        /// <summary>
+        /// Gets or sets the Layout property.  This dependency property 
+        /// indicates layout tree.
+        /// </summary>
+        public LayoutRoot Layout
+        {
+            get { return (LayoutRoot)GetValue(LayoutProperty); }
+            set { SetValue(LayoutProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Layout property.
+        /// </summary>
+        private static void OnLayoutChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutChanged(e.OldValue as LayoutRoot, e.NewValue as LayoutRoot);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the <see cref="DockingManager.Layout"/> property.
+        /// </summary>
+        protected virtual void OnLayoutChanged(LayoutRoot oldLayout, LayoutRoot newLayout)
+        {
+            if (oldLayout != null)
+            {
+                oldLayout.PropertyChanged -= new PropertyChangedEventHandler(OnLayoutRootPropertyChanged);
+                oldLayout.Updated -= new EventHandler(OnLayoutRootUpdated);
+            }
+
+            foreach (var fwc in _fwList.ToArray())
+            {
+                fwc.KeepContentVisibleOnClose = true;
+                fwc.InternalClose();
+            }
+
+            _fwList.Clear();
+
+            DetachDocumentsSource(oldLayout, DocumentsSource);
+            DetachAnchorablesSource(oldLayout, AnchorablesSource);
+
+            if (oldLayout != null &&
+                oldLayout.Manager == this)
+                oldLayout.Manager = null;
+
+            ClearLogicalChildrenList();
+            DetachLayoutItems();
+
+            Layout.Manager = this;
+
+            AttachLayoutItems();
+            AttachDocumentsSource(newLayout, DocumentsSource);
+            AttachAnchorablesSource(newLayout, AnchorablesSource);
+
+            if (IsLoaded)
+            {
+                LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+                LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
+                TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
+                RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
+                BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
+
+                foreach (var fw in Layout.FloatingWindows.ToArray())
+                {
+                    if (fw.IsValid)
+                       _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
+                }
+
+                foreach (var fw in _fwList)
+                {
+                    //fw.Owner = Window.GetWindow(this);
+                    //fw.SetParentToMainWindowOf(this);
+                }
+            }
+
+
+            if (newLayout != null)
+            {
+                newLayout.PropertyChanged += new PropertyChangedEventHandler(OnLayoutRootPropertyChanged);
+                newLayout.Updated += new EventHandler(OnLayoutRootUpdated);
+            }
+
+            if (LayoutChanged != null)
+                LayoutChanged(this, EventArgs.Empty);
+
+            //if (Layout != null)
+            //    Layout.CollectGarbage();
+
+            CommandManager.InvalidateRequerySuggested();
+        }
+
+        DispatcherOperation _setFocusAsyncOperation = null;
+
+        void OnLayoutRootPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == "RootPanel")
+            {
+                if (IsInitialized)
+                {
+                    var layoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+                    LayoutRootPanel = layoutRootPanel;
+                }
+            }
+            else if (e.PropertyName == "ActiveContent")
+            {
+                if (Layout.ActiveContent != null)
+                {
+                    //Debug.WriteLine(new StackTrace().ToString());
+
+                    //set focus on active element only after a layout pass is completed
+                    //it's possible that it is not yet visible in the visual tree
+                    if (_setFocusAsyncOperation == null)
+                    {
+                        _setFocusAsyncOperation = Dispatcher.BeginInvoke(new Action(() =>
+                            {
+                                if (Layout.ActiveContent != null)
+                                    FocusElementManager.SetFocusOnLastElement(Layout.ActiveContent);
+                                _setFocusAsyncOperation = null;
+                            }), DispatcherPriority.Background);
+                    }
+                }
+
+                if (!_insideInternalSetActiveContent)
+                    ActiveContent = Layout.ActiveContent != null ?
+                        Layout.ActiveContent.Content : null;
+            }
+        }
+
+        void OnLayoutRootUpdated(object sender, EventArgs e)
+        {
+            CommandManager.InvalidateRequerySuggested();
+        }
+
+
+        /// <summary>
+        /// Event fired when <see cref="DockingManager.Layout"/> property changes
+        /// </summary>
+        public event EventHandler LayoutChanged;
+
+        /// <summary>
+        /// Coerces the <see cref="DockingManager.Layout"/> value.
+        /// </summary>
+        private static object CoerceLayoutValue(DependencyObject d, object value)
+        {
+            if (value == null)
+                return new LayoutRoot() { RootPanel = new LayoutPanel(new LayoutDocumentPaneGroup(new LayoutDocumentPane())) };
+
+            ((DockingManager)d).OnLayoutChanging(value as LayoutRoot);
+
+            return value;
+        }
+
+        /// <summary>
+        /// Event fired when <see cref="DockingManager.Layout"/> property is about to be changed
+        /// </summary>
+        public event EventHandler LayoutChanging;
+
+        void OnLayoutChanging(LayoutRoot newLayout)
+        {
+            if (LayoutChanging != null)
+                LayoutChanging(this, EventArgs.Empty);
+        }
+
+
+        #region LayoutUpdateStrategy
+
+        /// <summary>
+        /// LayoutUpdateStrategy Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutUpdateStrategyProperty =
+            DependencyProperty.Register("LayoutUpdateStrategy", typeof(ILayoutUpdateStrategy), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ILayoutUpdateStrategy)null));
+
+        /// <summary>
+        /// Gets or sets the LayoutUpdateStrategy property.  This dependency property 
+        /// indicates the strategy class to call when AvalonDock needs to positionate a LayoutAnchorable inside an existing layout.
+        /// </summary>
+        /// <remarks>Sometimes it's impossible to automatically insert an anchorable in the layout without specifing the target parent pane.
+        /// Set this property to an object that will be asked to insert the anchorable to the desidered position.</remarks>
+        public ILayoutUpdateStrategy LayoutUpdateStrategy
+        {
+            get { return (ILayoutUpdateStrategy)GetValue(LayoutUpdateStrategyProperty); }
+            set { SetValue(LayoutUpdateStrategyProperty, value); }
+        }
+
+        #endregion
+
+
+
+        #endregion
+
+        public override void OnApplyTemplate()
+        {
+            base.OnApplyTemplate();
+
+            SetupAutoHideWindow();
+        }
+
+        protected override void OnInitialized(EventArgs e)
+        {
+            base.OnInitialized(e);
+
+            if (Layout.Manager == this)
+            {
+                LayoutRootPanel = CreateUIElementForModel(Layout.RootPanel) as LayoutPanelControl;
+                LeftSidePanel = CreateUIElementForModel(Layout.LeftSide) as LayoutAnchorSideControl;
+                TopSidePanel = CreateUIElementForModel(Layout.TopSide) as LayoutAnchorSideControl;
+                RightSidePanel = CreateUIElementForModel(Layout.RightSide) as LayoutAnchorSideControl;
+                BottomSidePanel = CreateUIElementForModel(Layout.BottomSide) as LayoutAnchorSideControl;
+            }
+
+
+        }
+
+        void DockingManager_Loaded(object sender, RoutedEventArgs e)
+        {
+            if (!DesignerProperties.GetIsInDesignMode(this))
+            {
+                //load windows not already loaded!
+                foreach (var fw in Layout.FloatingWindows.Where(fw => !_fwList.Any(fwc => fwc.Model == fw)))
+                    _fwList.Add(CreateUIElementForModel(fw) as LayoutFloatingWindowControl);
+
+                //create the overlaywindow if it's possible
+                if (IsVisible)
+                    CreateOverlayWindow();
+                FocusElementManager.SetupFocusManagement(this);
+            }
+        }
+
+        void DockingManager_Unloaded(object sender, RoutedEventArgs e)
+        {
+
+            if (!DesignerProperties.GetIsInDesignMode(this))
+            {
+                _autoHideWindowManager.HideAutoWindow();
+
+                foreach (var fw in _fwList.ToArray())
+                {
+                    //fw.Owner = null;
+                    fw.SetParentWindowToNull();
+                    fw.KeepContentVisibleOnClose = true;
+                    fw.Close();
+                }
+
+                DestroyOverlayWindow();
+                FocusElementManager.FinalizeFocusManagement(this);
+            }
+        }
+
+        internal UIElement CreateUIElementForModel(ILayoutElement model)
+        {
+            if (model is LayoutPanel)
+                return new LayoutPanelControl(model as LayoutPanel);
+            if (model is LayoutAnchorablePaneGroup)
+                return new LayoutAnchorablePaneGroupControl(model as LayoutAnchorablePaneGroup);
+            if (model is LayoutDocumentPaneGroup)
+                return new LayoutDocumentPaneGroupControl(model as LayoutDocumentPaneGroup);
+
+            if (model is LayoutAnchorSide)
+            {
+                var templateModelView = new LayoutAnchorSideControl(model as LayoutAnchorSide);
+                templateModelView.SetBinding(LayoutAnchorSideControl.TemplateProperty, new Binding("AnchorSideTemplate") { Source = this });
+                return templateModelView;
+            }
+            if (model is LayoutAnchorGroup)
+            {
+                var templateModelView = new LayoutAnchorGroupControl(model as LayoutAnchorGroup);
+                templateModelView.SetBinding(LayoutAnchorGroupControl.TemplateProperty, new Binding("AnchorGroupTemplate") { Source = this });
+                return templateModelView;
+            }
+
+            if (model is LayoutDocumentPane)
+            {
+                var templateModelView = new LayoutDocumentPaneControl(model as LayoutDocumentPane);
+                templateModelView.SetBinding(LayoutDocumentPaneControl.StyleProperty, new Binding("DocumentPaneControlStyle") { Source = this });
+                return templateModelView;
+            }
+            if (model is LayoutAnchorablePane)
+            {
+                var templateModelView = new LayoutAnchorablePaneControl(model as LayoutAnchorablePane);
+                templateModelView.SetBinding(LayoutAnchorablePaneControl.StyleProperty, new Binding("AnchorablePaneControlStyle") { Source = this });
+                return templateModelView;
+            }
+
+            if (model is LayoutAnchorableFloatingWindow)
+            {
+                if (DesignerProperties.GetIsInDesignMode(this))
+                    return null;
+                var modelFW = model as LayoutAnchorableFloatingWindow;
+                var newFW = new LayoutAnchorableFloatingWindowControl(modelFW)
+                {
+                    //Owner = Window.GetWindow(this) 
+                };
+                newFW.SetParentToMainWindowOf(this);
+
+                var paneForExtensions = modelFW.RootPanel.Children.OfType<LayoutAnchorablePane>().FirstOrDefault();
+                if (paneForExtensions != null)
+                {
+                    //ensure that floating window position is inside current (or nearest) monitor
+                    paneForExtensions.KeepInsideNearestMonitor();
+
+                    newFW.Left = paneForExtensions.FloatingLeft;
+                    newFW.Top = paneForExtensions.FloatingTop;
+                    newFW.Width = paneForExtensions.FloatingWidth;
+                    newFW.Height = paneForExtensions.FloatingHeight;
+                }
+
+                newFW.ShowInTaskbar = false;
+                newFW.Show();
+                return newFW;
+            }
+
+            if (model is LayoutDocumentFloatingWindow)
+            {
+                if (DesignerProperties.GetIsInDesignMode(this))
+                    return null;
+                var modelFW = model as LayoutDocumentFloatingWindow;
+                var newFW = new LayoutDocumentFloatingWindowControl(modelFW)
+                {
+                    //Owner = Window.GetWindow(this) 
+                };
+                newFW.SetParentToMainWindowOf(this);
+
+                var paneForExtensions = modelFW.RootDocument;
+                if (paneForExtensions != null)
+                {
+                    //ensure that floating window position is inside current (or nearest) monitor
+                    paneForExtensions.KeepInsideNearestMonitor();
+
+                    newFW.Left = paneForExtensions.FloatingLeft;
+                    newFW.Top = paneForExtensions.FloatingTop;
+                    newFW.Width = paneForExtensions.FloatingWidth;
+                    newFW.Height = paneForExtensions.FloatingHeight;
+                }
+
+                newFW.ShowInTaskbar = false;
+                newFW.Show();
+                return newFW;
+            }
+
+            if (model is LayoutDocument)
+            {
+                var templateModelView = new LayoutDocumentControl() { Model = model as LayoutDocument };
+                return templateModelView;
+            }
+
+            return null;
+        }
+
+
+
+        #region DocumentPaneTemplate
+
+        /// <summary>
+        /// DocumentPaneTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentPaneTemplateProperty =
+            DependencyProperty.Register("DocumentPaneTemplate", typeof(ControlTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ControlTemplate)null,
+                    new PropertyChangedCallback(OnDocumentPaneTemplateChanged)));
+
+        /// <summary>
+        /// Gets or sets the DocumentPaneDataTemplate property.  This dependency property 
+        /// indicates .
+        /// </summary>
+        public ControlTemplate DocumentPaneTemplate
+        {
+            get { return (ControlTemplate)GetValue(DocumentPaneTemplateProperty); }
+            set { SetValue(DocumentPaneTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentPaneTemplate property.
+        /// </summary>
+        private static void OnDocumentPaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentPaneTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentPaneTemplate property.
+        /// </summary>
+        protected virtual void OnDocumentPaneTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region AnchorablePaneTemplate
+
+        /// <summary>
+        /// AnchorablePaneTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorablePaneTemplateProperty =
+            DependencyProperty.Register("AnchorablePaneTemplate", typeof(ControlTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ControlTemplate)null,
+                    new PropertyChangedCallback(OnAnchorablePaneTemplateChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorablePaneTemplate property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public ControlTemplate AnchorablePaneTemplate
+        {
+            get { return (ControlTemplate)GetValue(AnchorablePaneTemplateProperty); }
+            set { SetValue(AnchorablePaneTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorablePaneDataTemplate property.
+        /// </summary>
+        private static void OnAnchorablePaneTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorablePaneTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorablePaneDataTemplate property.
+        /// </summary>
+        protected virtual void OnAnchorablePaneTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region AnchorSideTemplate
+
+        /// <summary>
+        /// AnchorSideTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorSideTemplateProperty =
+            DependencyProperty.Register("AnchorSideTemplate", typeof(ControlTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ControlTemplate)null));
+
+        /// <summary>
+        /// Gets or sets the AnchorSideTemplate property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public ControlTemplate AnchorSideTemplate
+        {
+            get { return (ControlTemplate)GetValue(AnchorSideTemplateProperty); }
+            set { SetValue(AnchorSideTemplateProperty, value); }
+        }
+
+        #endregion
+
+        #region AnchorGroupTemplate
+
+        /// <summary>
+        /// AnchorGroupTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorGroupTemplateProperty =
+            DependencyProperty.Register("AnchorGroupTemplate", typeof(ControlTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ControlTemplate)null));
+
+        /// <summary>
+        /// Gets or sets the AnchorGroupTemplate property.  This dependency property 
+        /// indicates the template used to render the AnchorGroup control.
+        /// </summary>
+        public ControlTemplate AnchorGroupTemplate
+        {
+            get { return (ControlTemplate)GetValue(AnchorGroupTemplateProperty); }
+            set { SetValue(AnchorGroupTemplateProperty, value); }
+        }
+
+        #endregion
+
+        #region AnchorTemplate
+
+        /// <summary>
+        /// AnchorTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorTemplateProperty =
+            DependencyProperty.Register("AnchorTemplate", typeof(ControlTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ControlTemplate)null));
+
+        /// <summary>
+        /// Gets or sets the AnchorTemplate property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public ControlTemplate AnchorTemplate
+        {
+            get { return (ControlTemplate)GetValue(AnchorTemplateProperty); }
+            set { SetValue(AnchorTemplateProperty, value); }
+        }
+
+        #endregion
+
+        #region DocumentPaneControlStyle
+
+        /// <summary>
+        /// DocumentPaneControlStyle Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentPaneControlStyleProperty =
+            DependencyProperty.Register("DocumentPaneControlStyle", typeof(Style), typeof(DockingManager),
+                new FrameworkPropertyMetadata((Style)null,
+                    new PropertyChangedCallback(OnDocumentPaneControlStyleChanged)));
+
+        /// <summary>
+        /// Gets or sets the DocumentPaneControlStyle property.  This dependency property 
+        /// indicates ....
+        /// </summary>
+        public Style DocumentPaneControlStyle
+        {
+            get { return (Style)GetValue(DocumentPaneControlStyleProperty); }
+            set { SetValue(DocumentPaneControlStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentPaneControlStyle property.
+        /// </summary>
+        private static void OnDocumentPaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentPaneControlStyleChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentPaneControlStyle property.
+        /// </summary>
+        protected virtual void OnDocumentPaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region AnchorablePaneControlStyle
+
+        /// <summary>
+        /// AnchorablePaneControlStyle Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorablePaneControlStyleProperty =
+            DependencyProperty.Register("AnchorablePaneControlStyle", typeof(Style), typeof(DockingManager),
+                new FrameworkPropertyMetadata((Style)null,
+                    new PropertyChangedCallback(OnAnchorablePaneControlStyleChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorablePaneControlStyle property.  This dependency property 
+        /// indicates the style to apply to AnchorablePaneControl.
+        /// </summary>
+        public Style AnchorablePaneControlStyle
+        {
+            get { return (Style)GetValue(AnchorablePaneControlStyleProperty); }
+            set { SetValue(AnchorablePaneControlStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorablePaneControlStyle property.
+        /// </summary>
+        private static void OnAnchorablePaneControlStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorablePaneControlStyleChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorablePaneControlStyle property.
+        /// </summary>
+        protected virtual void OnAnchorablePaneControlStyleChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region DocumentHeaderTemplate
+
+        /// <summary>
+        /// DocumentHeaderTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentHeaderTemplateProperty =
+            DependencyProperty.Register("DocumentHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnDocumentHeaderTemplateChanged),
+                    new CoerceValueCallback(CoerceDocumentHeaderTemplateValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentHeaderTemplate property.  This dependency property 
+        /// indicates data template to use for document header.
+        /// </summary>
+        public DataTemplate DocumentHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(DocumentHeaderTemplateProperty); }
+            set { SetValue(DocumentHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentHeaderTemplate property.
+        /// </summary>
+        private static void OnDocumentHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentHeaderTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplate property.
+        /// </summary>
+        protected virtual void OnDocumentHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the DocumentHeaderTemplate value.
+        /// </summary>
+        private static object CoerceDocumentHeaderTemplateValue(DependencyObject d, object value)
+        {
+            if (value != null &&
+                d.GetValue(DocumentHeaderTemplateSelectorProperty) != null)
+                return null;
+            return value;
+        }
+
+        #endregion
+
+        #region DocumentHeaderTemplateSelector
+
+        /// <summary>
+        /// DocumentHeaderTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentHeaderTemplateSelectorProperty =
+            DependencyProperty.Register("DocumentHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnDocumentHeaderTemplateSelectorChanged),
+                    new CoerceValueCallback(CoerceDocumentHeaderTemplateSelectorValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentHeaderTemplateSelector property.  This dependency property 
+        /// indicates the template selector that is used when selcting the data template for the header.
+        /// </summary>
+        public DataTemplateSelector DocumentHeaderTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(DocumentHeaderTemplateSelectorProperty); }
+            set { SetValue(DocumentHeaderTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentHeaderTemplateSelector property.
+        /// </summary>
+        private static void OnDocumentHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentHeaderTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentHeaderTemplateSelector property.
+        /// </summary>
+        protected virtual void OnDocumentHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null &&
+                DocumentHeaderTemplate != null)
+                DocumentHeaderTemplate = null;
+
+            if (DocumentPaneMenuItemHeaderTemplateSelector == null)
+                DocumentPaneMenuItemHeaderTemplateSelector = DocumentHeaderTemplateSelector;
+
+        }
+
+        /// <summary>
+        /// Coerces the DocumentHeaderTemplateSelector value.
+        /// </summary>
+        private static object CoerceDocumentHeaderTemplateSelectorValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        #endregion
+
+        #region DocumentTitleTemplate
+
+        /// <summary>
+        /// DocumentTitleTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentTitleTemplateProperty =
+            DependencyProperty.Register("DocumentTitleTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnDocumentTitleTemplateChanged),
+                    new CoerceValueCallback(CoerceDocumentTitleTemplateValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentTitleTemplate property.  This dependency property 
+        /// indicates the datatemplate to use when creating the title for a document.
+        /// </summary>
+        public DataTemplate DocumentTitleTemplate
+        {
+            get { return (DataTemplate)GetValue(DocumentTitleTemplateProperty); }
+            set { SetValue(DocumentTitleTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentTitleTemplate property.
+        /// </summary>
+        private static void OnDocumentTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentTitleTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplate property.
+        /// </summary>
+        protected virtual void OnDocumentTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the DocumentTitleTemplate value.
+        /// </summary>
+        private static object CoerceDocumentTitleTemplateValue(DependencyObject d, object value)
+        {
+            if (value != null &&
+                d.GetValue(DocumentTitleTemplateSelectorProperty) != null)
+                return null;
+
+            return value;
+        }
+
+        #endregion
+
+        #region DocumentTitleTemplateSelector
+
+        /// <summary>
+        /// DocumentTitleTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentTitleTemplateSelectorProperty =
+            DependencyProperty.Register("DocumentTitleTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnDocumentTitleTemplateSelectorChanged),
+                    new CoerceValueCallback(CoerceDocumentTitleTemplateSelectorValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentTitleTemplateSelector property.  This dependency property 
+        /// indicates the data template selector to use when creating the data template for the title.
+        /// </summary>
+        public DataTemplateSelector DocumentTitleTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(DocumentTitleTemplateSelectorProperty); }
+            set { SetValue(DocumentTitleTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentTitleTemplateSelector property.
+        /// </summary>
+        private static void OnDocumentTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentTitleTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentTitleTemplateSelector property.
+        /// </summary>
+        protected virtual void OnDocumentTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null)
+                DocumentTitleTemplate = null;                
+        }
+
+        /// <summary>
+        /// Coerces the DocumentTitleTemplateSelector value.
+        /// </summary>
+        private static object CoerceDocumentTitleTemplateSelectorValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        #endregion
+
+        #region AnchorableTitleTemplate
+
+        /// <summary>
+        /// AnchorableTitleTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableTitleTemplateProperty =
+            DependencyProperty.Register("AnchorableTitleTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnAnchorableTitleTemplateChanged),
+                    new CoerceValueCallback(CoerceAnchorableTitleTemplateValue)));
+
+        /// <summary>
+        /// Gets or sets the AnchorableTitleTemplate property.  This dependency property 
+        /// indicates the data template to use for anchorables title.
+        /// </summary>
+        public DataTemplate AnchorableTitleTemplate
+        {
+            get { return (DataTemplate)GetValue(AnchorableTitleTemplateProperty); }
+            set { SetValue(AnchorableTitleTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorableTitleTemplate property.
+        /// </summary>
+        private static void OnAnchorableTitleTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorableTitleTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplate property.
+        /// </summary>
+        protected virtual void OnAnchorableTitleTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the AnchorableTitleTemplate value.
+        /// </summary>
+        private static object CoerceAnchorableTitleTemplateValue(DependencyObject d, object value)
+        {
+            if (value != null &&
+                d.GetValue(AnchorableTitleTemplateSelectorProperty) != null)
+                return null;
+            return value;
+        }
+
+        #endregion
+
+        #region AnchorableTitleTemplateSelector
+
+        /// <summary>
+        /// AnchorableTitleTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableTitleTemplateSelectorProperty =
+            DependencyProperty.Register("AnchorableTitleTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnAnchorableTitleTemplateSelectorChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorableTitleTemplateSelector property.  This dependency property 
+        /// indicates selctor to use when selecting data template for the title of anchorables.
+        /// </summary>
+        public DataTemplateSelector AnchorableTitleTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(AnchorableTitleTemplateSelectorProperty); }
+            set { SetValue(AnchorableTitleTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorableTitleTemplateSelector property.
+        /// </summary>
+        private static void OnAnchorableTitleTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorableTitleTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorableTitleTemplateSelector property.
+        /// </summary>
+        protected virtual void OnAnchorableTitleTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null &&
+                AnchorableTitleTemplate != null)
+                AnchorableTitleTemplate = null;
+        }
+
+        #endregion
+
+        #region AnchorableHeaderTemplate
+
+        /// <summary>
+        /// AnchorableHeaderTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableHeaderTemplateProperty =
+            DependencyProperty.Register("AnchorableHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnAnchorableHeaderTemplateChanged),
+                    new CoerceValueCallback(CoerceAnchorableHeaderTemplateValue)));
+
+        /// <summary>
+        /// Gets or sets the AnchorableHeaderTemplate property.  This dependency property 
+        /// indicates the data template to use for anchorable templates.
+        /// </summary>
+        public DataTemplate AnchorableHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(AnchorableHeaderTemplateProperty); }
+            set { SetValue(AnchorableHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorableHeaderTemplate property.
+        /// </summary>
+        private static void OnAnchorableHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorableHeaderTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplate property.
+        /// </summary>
+        protected virtual void OnAnchorableHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        /// <summary>
+        /// Coerces the AnchorableHeaderTemplate value.
+        /// </summary>
+        private static object CoerceAnchorableHeaderTemplateValue(DependencyObject d, object value)
+        {
+            if (value != null &&
+                d.GetValue(AnchorableHeaderTemplateSelectorProperty) != null)
+                return null;
+
+            return value;
+        }
+
+        #endregion
+
+        #region AnchorableHeaderTemplateSelector
+
+        /// <summary>
+        /// AnchorableHeaderTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableHeaderTemplateSelectorProperty =
+            DependencyProperty.Register("AnchorableHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnAnchorableHeaderTemplateSelectorChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorableHeaderTemplateSelector property.  This dependency property 
+        /// indicates the selector to use when selecting the data template for anchorable headers.
+        /// </summary>
+        public DataTemplateSelector AnchorableHeaderTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(AnchorableHeaderTemplateSelectorProperty); }
+            set { SetValue(AnchorableHeaderTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorableHeaderTemplateSelector property.
+        /// </summary>
+        private static void OnAnchorableHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorableHeaderTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorableHeaderTemplateSelector property.
+        /// </summary>
+        protected virtual void OnAnchorableHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null)
+                AnchorableHeaderTemplate = null;
+        }
+
+        #endregion
+
+        protected override void OnGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+            //if (e.NewFocus is Grid)
+          //    Trace.WriteLine(string.Format("DockingManager.OnGotKeyboardFocus({0})", e.NewFocus));
+            base.OnGotKeyboardFocus(e);
+        }
+
+        protected override void OnPreviewGotKeyboardFocus(System.Windows.Input.KeyboardFocusChangedEventArgs e)
+        {
+          Trace.WriteLine( string.Format( "DockingManager.OnPreviewGotKeyboardFocus({0})", e.NewFocus ) );
+
+            base.OnPreviewGotKeyboardFocus(e);
+        }
+
+        protected override void OnPreviewLostKeyboardFocus(KeyboardFocusChangedEventArgs e)
+        {
+          Trace.WriteLine( string.Format( "DockingManager.OnPreviewLostKeyboardFocus({0})", e.OldFocus ) );
+            base.OnPreviewLostKeyboardFocus(e);
+        }
+
+        protected override void OnMouseLeftButtonDown(System.Windows.Input.MouseButtonEventArgs e)
+        {
+          Trace.WriteLine( string.Format( "DockingManager.OnMouseLeftButtonDown([{0}])", e.GetPosition( this ) ) );
+            base.OnMouseLeftButtonDown(e);
+        }
+
+        protected override void OnMouseMove(System.Windows.Input.MouseEventArgs e)
+        {
+          //Trace.WriteLine(string.Format("DockingManager.OnMouseMove([{0}])", e.GetPosition(this)));
+            base.OnMouseMove(e);
+        }
+
+
+
+        #region LayoutRootPanel
+
+        /// <summary>
+        /// LayoutRootPanel Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutRootPanelProperty =
+            DependencyProperty.Register("LayoutRootPanel", typeof(LayoutPanelControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutPanelControl)null,
+                    new PropertyChangedCallback(OnLayoutRootPanelChanged)));
+
+        /// <summary>
+        /// Gets or sets the LayoutRootPanel property.  This dependency property 
+        /// indicates the layout panel control which is attached to the Layout.Root property.
+        /// </summary>
+        public LayoutPanelControl LayoutRootPanel
+        {
+            get { return (LayoutPanelControl)GetValue(LayoutRootPanelProperty); }
+            set { SetValue(LayoutRootPanelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the LayoutRootPanel property.
+        /// </summary>
+        private static void OnLayoutRootPanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutRootPanelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the LayoutRootPanel property.
+        /// </summary>
+        protected virtual void OnLayoutRootPanelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+        }
+
+        #endregion
+
+        #region RightSidePanel
+
+        /// <summary>
+        /// RightSidePanel Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty RightSidePanelProperty =
+            DependencyProperty.Register("RightSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
+                    new PropertyChangedCallback(OnRightSidePanelChanged)));
+
+        /// <summary>
+        /// Gets or sets the RightSidePanel property.  This dependency property 
+        /// indicates right side anchor panel.
+        /// </summary>
+        public LayoutAnchorSideControl RightSidePanel
+        {
+            get { return (LayoutAnchorSideControl)GetValue(RightSidePanelProperty); }
+            set { SetValue(RightSidePanelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the RightSidePanel property.
+        /// </summary>
+        private static void OnRightSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnRightSidePanelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the RightSidePanel property.
+        /// </summary>
+        protected virtual void OnRightSidePanelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+        }
+
+        #endregion
+
+        #region LeftSidePanel
+
+        /// <summary>
+        /// LeftSidePanel Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LeftSidePanelProperty =
+            DependencyProperty.Register("LeftSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
+                    new PropertyChangedCallback(OnLeftSidePanelChanged)));
+
+        /// <summary>
+        /// Gets or sets the LeftSidePanel property.  This dependency property 
+        /// indicates the left side panel control.
+        /// </summary>
+        public LayoutAnchorSideControl LeftSidePanel
+        {
+            get { return (LayoutAnchorSideControl)GetValue(LeftSidePanelProperty); }
+            set { SetValue(LeftSidePanelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the LeftSidePanel property.
+        /// </summary>
+        private static void OnLeftSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLeftSidePanelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the LeftSidePanel property.
+        /// </summary>
+        protected virtual void OnLeftSidePanelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+        }
+
+        #endregion
+
+        #region TopSidePanel
+
+        /// <summary>
+        /// TopSidePanel Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty TopSidePanelProperty =
+            DependencyProperty.Register("TopSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
+                    new PropertyChangedCallback(OnTopSidePanelChanged)));
+
+        /// <summary>
+        /// Gets or sets the TopSidePanel property.  This dependency property 
+        /// indicates top side control panel.
+        /// </summary>
+        public LayoutAnchorSideControl TopSidePanel
+        {
+            get { return (LayoutAnchorSideControl)GetValue(TopSidePanelProperty); }
+            set { SetValue(TopSidePanelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the TopSidePanel property.
+        /// </summary>
+        private static void OnTopSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnTopSidePanelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the TopSidePanel property.
+        /// </summary>
+        protected virtual void OnTopSidePanelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+        }
+
+        #endregion
+
+        #region BottomSidePanel
+
+        /// <summary>
+        /// BottomSidePanel Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty BottomSidePanelProperty =
+            DependencyProperty.Register("BottomSidePanel", typeof(LayoutAnchorSideControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutAnchorSideControl)null,
+                    new PropertyChangedCallback(OnBottomSidePanelChanged)));
+
+        /// <summary>
+        /// Gets or sets the BottomSidePanel property.  This dependency property 
+        /// indicates bottom side panel control.
+        /// </summary>
+        public LayoutAnchorSideControl BottomSidePanel
+        {
+            get { return (LayoutAnchorSideControl)GetValue(BottomSidePanelProperty); }
+            set { SetValue(BottomSidePanelProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the BottomSidePanel property.
+        /// </summary>
+        private static void OnBottomSidePanelChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnBottomSidePanelChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the BottomSidePanel property.
+        /// </summary>
+        protected virtual void OnBottomSidePanelChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+        }
+
+        #endregion
+
+
+        #region LogicalChildren
+
+        List<WeakReference> _logicalChildren = new List<WeakReference>();
+
+        protected override System.Collections.IEnumerator LogicalChildren
+        {
+            get
+            {
+                return _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).GetEnumerator();
+            }
+        }
+
+
+        internal void InternalAddLogicalChild(object element)
+        {
+          //System.Diagnostics.Trace.WriteLine("[{0}]InternalAddLogicalChild({1})", this, element);
+#if DEBUG
+            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
+                new InvalidOperationException();
+#endif
+            if (_logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).Contains(element))
+                return;
+
+            _logicalChildren.Add(new WeakReference(element));
+            AddLogicalChild(element);
+        }
+
+        internal void InternalRemoveLogicalChild(object element)
+        {
+          //System.Diagnostics.Trace.WriteLine("[{0}]InternalRemoveLogicalChild({1})", this, element);
+
+            var wrToRemove = _logicalChildren.FirstOrDefault(ch => ch.GetValueOrDefault<object>() == element);
+            if (wrToRemove != null)
+                _logicalChildren.Remove(wrToRemove);
+            RemoveLogicalChild(element);
+        }
+
+        void ClearLogicalChildrenList()
+        {
+            foreach (var child in _logicalChildren.Select(ch => ch.GetValueOrDefault<object>()).ToArray())
+                RemoveLogicalChild(child);
+            _logicalChildren.Clear();
+        }
+
+        #endregion  
+
+        #region AutoHide window
+        internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
+        {
+            _autoHideWindowManager.ShowAutoHideWindow(anchor);
+            //if (_autohideArea == null)
+            //    return;
+
+            //if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
+            //    return;
+
+          //Trace.WriteLine("ShowAutoHideWindow()");
+
+            //_currentAutohiddenAnchor = new WeakReference(anchor);
+
+            //HideAutoHideWindow(anchor);
+
+            //SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
+            //AutoHideWindow.Show();
+        }
+
+        internal void HideAutoHideWindow(LayoutAnchorControl anchor)
+        {
+            _autoHideWindowManager.HideAutoWindow(anchor);
+        }
+
+
+        void SetupAutoHideWindow()
+        {
+            _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
+
+            if (_autoHideWindowManager != null)
+                _autoHideWindowManager.HideAutoWindow();
+            else
+                _autoHideWindowManager = new AutoHideWindowManager(this);
+
+            if (AutoHideWindow != null)
+                AutoHideWindow.Dispose();
+
+            SetAutoHideWindow(new LayoutAutoHideWindowControl());
+        }
+
+        AutoHideWindowManager _autoHideWindowManager;
+
+        FrameworkElement _autohideArea;
+        internal FrameworkElement GetAutoHideAreaElement()
+        {
+            return _autohideArea;
+        }
+
+        #region AutoHideWindow
+
+        /// <summary>
+        /// AutoHideWindow Read-Only Dependency Property
+        /// </summary>
+        private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
+            = DependencyProperty.RegisterReadOnly("AutoHideWindow", typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
+                new FrameworkPropertyMetadata((LayoutAutoHideWindowControl)null,
+                    new PropertyChangedCallback(OnAutoHideWindowChanged)));
+
+        public static readonly DependencyProperty AutoHideWindowProperty
+            = AutoHideWindowPropertyKey.DependencyProperty;
+
+        /// <summary>
+        /// Gets the AutoHideWindow property.  This dependency property 
+        /// indicates the currently shown autohide window.
+        /// </summary>
+        public LayoutAutoHideWindowControl AutoHideWindow
+        {
+            get { return (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty); }
+        }
+
+        /// <summary>
+        /// Provides a secure method for setting the AutoHideWindow property.  
+        /// This dependency property indicates the currently shown autohide window.
+        /// </summary>
+        /// <param name="value">The new value for the property.</param>
+        protected void SetAutoHideWindow(LayoutAutoHideWindowControl value)
+        {
+            SetValue(AutoHideWindowPropertyKey, value);
+        }
+
+        /// <summary>
+        /// Handles changes to the AutoHideWindow property.
+        /// </summary>
+        private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAutoHideWindowChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
+        /// </summary>
+        protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.OldValue != null)
+                InternalRemoveLogicalChild(e.OldValue);
+            if (e.NewValue != null)
+                InternalAddLogicalChild(e.NewValue);
+
+        }
+
+        #endregion
+
+
+
+        #endregion
+        // #region AutoHide window
+        //WeakReference _currentAutohiddenAnchor = null;
+        //internal void ShowAutoHideWindow(LayoutAnchorControl anchor)
+        //{
+        //    if (_autohideArea == null)
+        //        return;
+
+        //    if (AutoHideWindow != null && AutoHideWindow.Model == anchor.Model)
+        //        return;
+
+        //    Trace.WriteLine("ShowAutoHideWindow()");
+
+        //    _currentAutohiddenAnchor = new WeakReference(anchor);
+
+        //    HideAutoHideWindow(anchor);
+
+        //    SetAutoHideWindow(new LayoutAutoHideWindowControl(anchor));
+        //}
+
+        //internal void HideAutoHideWindow(LayoutAnchorControl anchor)
+        //{
+        //    if (AutoHideWindow != null)
+        //    {
+        //        if (anchor == _currentAutohiddenAnchor.GetValueOrDefault<LayoutAnchorControl>())
+        //        {
+        //            Trace.WriteLine("AutoHideWindow()");
+        //            AutoHideWindow.Dispose();
+        //            SetAutoHideWindow(null);
+        //        }
+        //    }
+        //}
+
+        //FrameworkElement _autohideArea;
+        //internal FrameworkElement GetAutoHideAreaElement()
+        //{
+        //    return _autohideArea;
+        //}
+
+        //void SetupAutoHideArea()
+        //{
+        //    _autohideArea = GetTemplateChild("PART_AutoHideArea") as FrameworkElement;
+        //}
+
+        // #region AutoHideWindow
+
+        ///// <summary>
+        ///// AutoHideWindow Read-Only Dependency Property
+        ///// </summary>
+        //private static readonly DependencyPropertyKey AutoHideWindowPropertyKey
+        //    = DependencyProperty.RegisterReadOnly("AutoHideWindow", typeof(LayoutAutoHideWindowControl), typeof(DockingManager),
+        //        new FrameworkPropertyMetadata((LayoutAutoHideWindowControl)null,
+        //            new PropertyChangedCallback(OnAutoHideWindowChanged)));
+
+        //public static readonly DependencyProperty AutoHideWindowProperty
+        //    = AutoHideWindowPropertyKey.DependencyProperty;
+
+        ///// <summary>
+        ///// Gets the AutoHideWindow property.  This dependency property 
+        ///// indicates the currently shown autohide window.
+        ///// </summary>
+        //public LayoutAutoHideWindowControl AutoHideWindow
+        //{
+        //    get { return (LayoutAutoHideWindowControl)GetValue(AutoHideWindowProperty); }
+        //}
+
+        ///// <summary>
+        ///// Provides a secure method for setting the AutoHideWindow property.  
+        ///// This dependency property indicates the currently shown autohide window.
+        ///// </summary>
+        ///// <param name="value">The new value for the property.</param>
+        //protected void SetAutoHideWindow(LayoutAutoHideWindowControl value)
+        //{
+        //    SetValue(AutoHideWindowPropertyKey, value);
+        //}
+
+        ///// <summary>
+        ///// Handles changes to the AutoHideWindow property.
+        ///// </summary>
+        //private static void OnAutoHideWindowChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        //{
+        //    ((DockingManager)d).OnAutoHideWindowChanged(e);
+        //}
+
+        ///// <summary>
+        ///// Provides derived classes an opportunity to handle changes to the AutoHideWindow property.
+        ///// </summary>
+        //protected virtual void OnAutoHideWindowChanged(DependencyPropertyChangedEventArgs e)
+        //{
+        //    if (e.OldValue != null)
+        //        ((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(e.OldValue);
+        //    if (e.NewValue != null)
+        //        ((ILogicalChildrenContainer)this).InternalAddLogicalChild(e.NewValue);
+        //}
+
+        // #endregion
+
+
+
+        // #endregion
+
+        #region Floating Windows
+        List<LayoutFloatingWindowControl> _fwList = new List<LayoutFloatingWindowControl>();
+
+        internal void StartDraggingFloatingWindowForContent(LayoutContent contentModel, bool startDrag = true)
+        {
+            if (!contentModel.CanFloat)
+                return;
+            var contentModelAsAnchorable = contentModel as LayoutAnchorable;
+            if (contentModelAsAnchorable != null &&
+                contentModelAsAnchorable.IsAutoHidden)
+                contentModelAsAnchorable.ToggleAutoHide();
+
+            var parentPane = contentModel.Parent as ILayoutPane;
+            var parentPaneAsPositionableElement = contentModel.Parent as ILayoutPositionableElement;
+            var parentPaneAsWithActualSize = contentModel.Parent as ILayoutPositionableElementWithActualSize;
+            var contentModelParentChildrenIndex = parentPane.Children.ToList().IndexOf(contentModel);
+
+            if (contentModel.FindParent<LayoutFloatingWindow>() == null)
+            {
+                ((ILayoutPreviousContainer)contentModel).PreviousContainer = parentPane;
+                contentModel.PreviousContainerIndex = contentModelParentChildrenIndex;
+            }
+
+            parentPane.RemoveChildAt(contentModelParentChildrenIndex);
+
+            double fwWidth = contentModel.FloatingWidth; 
+            double fwHeight = contentModel.FloatingHeight; 
+
+            if (fwWidth == 0.0)
+                fwWidth = parentPaneAsPositionableElement.FloatingWidth;
+            if (fwHeight == 0.0)
+                fwHeight = parentPaneAsPositionableElement.FloatingHeight;
+
+            if (fwWidth == 0.0)
+                fwWidth = parentPaneAsWithActualSize.ActualWidth;
+            if (fwHeight == 0.0)
+                fwHeight = parentPaneAsWithActualSize.ActualHeight;
+
+            LayoutFloatingWindow fw;
+            LayoutFloatingWindowControl fwc;
+            if (contentModel is LayoutAnchorable)
+            {
+                var anchorableContent = contentModel as LayoutAnchorable;
+                fw = new LayoutAnchorableFloatingWindow()
+                {
+                    RootPanel = new LayoutAnchorablePaneGroup(
+                        new LayoutAnchorablePane(anchorableContent)
+                        {
+                            DockWidth = parentPaneAsPositionableElement.DockWidth,
+                            DockHeight = parentPaneAsPositionableElement.DockHeight,
+                            DockMinHeight = parentPaneAsPositionableElement.DockMinHeight,
+                            DockMinWidth = parentPaneAsPositionableElement.DockMinWidth,
+                            FloatingLeft = parentPaneAsPositionableElement.FloatingLeft,
+                            FloatingTop = parentPaneAsPositionableElement.FloatingTop,
+                            FloatingWidth = parentPaneAsPositionableElement.FloatingWidth,
+                            FloatingHeight = parentPaneAsPositionableElement.FloatingHeight,
+                        })
+                };
+
+                Layout.FloatingWindows.Add(fw);
+
+                fwc = new LayoutAnchorableFloatingWindowControl(
+                    fw as LayoutAnchorableFloatingWindow)
+                    {
+                        Width = fwWidth,
+                        Height = fwHeight,
+                        Left = contentModel.FloatingLeft,
+                        Top = contentModel.FloatingTop
+                    };
+            }
+            else
+            {
+                var anchorableDocument = contentModel as LayoutDocument;
+                fw = new LayoutDocumentFloatingWindow()
+                {
+                    RootDocument = anchorableDocument
+                };
+
+                Layout.FloatingWindows.Add(fw);
+
+                fwc = new LayoutDocumentFloatingWindowControl(
+                    fw as LayoutDocumentFloatingWindow)
+                {
+                    Width = fwWidth,
+                    Height = fwHeight,
+                    Left = contentModel.FloatingLeft,
+                    Top = contentModel.FloatingTop
+                };
+            }
+
+
+            //fwc.Owner = Window.GetWindow(this);
+            //fwc.SetParentToMainWindowOf(this);
+
+
+            _fwList.Add(fwc);
+
+            Layout.CollectGarbage();
+
+            UpdateLayout();
+
+            Dispatcher.BeginInvoke(new Action(() =>
+            {
+                if (startDrag)
+                    fwc.AttachDrag();
+                fwc.Show();
+            }), DispatcherPriority.Send);
+        }
+
+        internal void StartDraggingFloatingWindowForPane(LayoutAnchorablePane paneModel)
+        {
+            if (paneModel.Children.Any(c => !c.CanFloat))
+                return;
+            var paneAsPositionableElement = paneModel as ILayoutPositionableElement;
+            var paneAsWithActualSize = paneModel as ILayoutPositionableElementWithActualSize;
+
+            double fwWidth = paneAsPositionableElement.FloatingWidth;
+            double fwHeight = paneAsPositionableElement.FloatingHeight;
+            double fwLeft = paneAsPositionableElement.FloatingLeft;
+            double fwTop = paneAsPositionableElement.FloatingTop;
+
+
+
+            if (fwWidth == 0.0)
+                fwWidth = paneAsWithActualSize.ActualWidth;
+            if (fwHeight == 0.0)
+                fwHeight = paneAsWithActualSize.ActualHeight;
+
+            var destPane = new LayoutAnchorablePane()
+            {
+                DockWidth = paneAsPositionableElement.DockWidth,
+                DockHeight = paneAsPositionableElement.DockHeight,
+                DockMinHeight = paneAsPositionableElement.DockMinHeight,
+                DockMinWidth = paneAsPositionableElement.DockMinWidth,
+                FloatingLeft = paneAsPositionableElement.FloatingLeft,
+                FloatingTop = paneAsPositionableElement.FloatingTop,
+                FloatingWidth = paneAsPositionableElement.FloatingWidth,
+                FloatingHeight = paneAsPositionableElement.FloatingHeight,
+            };
+
+            bool savePreviousContainer = paneModel.FindParent<LayoutFloatingWindow>() == null;
+            int currentSelectedContentIndex = paneModel.SelectedContentIndex;
+            while (paneModel.Children.Count > 0)
+            {
+                var contentModel = paneModel.Children[paneModel.Children.Count - 1] as LayoutAnchorable;
+
+                if (savePreviousContainer)
+                {
+                    var contentModelAsPreviousContainer = contentModel as ILayoutPreviousContainer;
+                    contentModelAsPreviousContainer.PreviousContainer = paneModel;
+                    contentModel.PreviousContainerIndex = paneModel.Children.Count - 1;
+                }
+
+                paneModel.RemoveChildAt(paneModel.Children.Count - 1);
+                destPane.Children.Insert(0, contentModel);
+            }
+
+            if (destPane.Children.Count > 0)
+            {
+                destPane.SelectedContentIndex = currentSelectedContentIndex;
+            }
+
+
+            LayoutFloatingWindow fw;
+            LayoutFloatingWindowControl fwc;
+            fw = new LayoutAnchorableFloatingWindow()
+            {
+                RootPanel = new LayoutAnchorablePaneGroup(
+                    destPane) 
+                    {
+                        DockHeight = destPane.DockHeight,
+                        DockWidth = destPane.DockWidth,
+                        DockMinHeight = destPane.DockMinHeight,
+                        DockMinWidth = destPane.DockMinWidth,
+                    }
+            };
+
+            Layout.FloatingWindows.Add(fw);
+
+            fwc = new LayoutAnchorableFloatingWindowControl(
+                fw as LayoutAnchorableFloatingWindow)
+            {
+                Width = fwWidth,
+                Height = fwHeight
+            };
+
+
+
+            //fwc.Owner = Window.GetWindow(this);
+            //fwc.SetParentToMainWindowOf(this);
+
+
+            _fwList.Add(fwc);
+
+            Layout.CollectGarbage();
+
+            InvalidateArrange();
+
+            fwc.AttachDrag();
+            fwc.Show(); 
+
+        }
+
+        internal IEnumerable<LayoutFloatingWindowControl> GetFloatingWindowsByZOrder()
+        {
+            var parentWindow = Window.GetWindow(this);
+
+            if (parentWindow == null)
+                yield break;
+
+            IntPtr windowParentHanlde = new WindowInteropHelper(parentWindow).Handle;
+
+            IntPtr currentHandle = Win32Helper.GetWindow(windowParentHanlde, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDFIRST);
+            while (currentHandle != IntPtr.Zero)
+            {
+                LayoutFloatingWindowControl ctrl = _fwList.FirstOrDefault(fw => new WindowInteropHelper(fw).Handle == currentHandle);
+                if (ctrl != null && ctrl.Model.Root.Manager == this)
+                    yield return ctrl;
+
+                currentHandle = Win32Helper.GetWindow(currentHandle, (uint)Win32Helper.GetWindow_Cmd.GW_HWNDNEXT);
+            }
+        }
+
+        internal void RemoveFloatingWindow(LayoutFloatingWindowControl floatingWindow)
+        {
+            _fwList.Remove(floatingWindow);
+        }
+
+        public IEnumerable<LayoutFloatingWindowControl> FloatingWindows
+        {
+            get { return _fwList; }
+        }
+        #endregion
+
+        #region OverlayWindow
+
+        bool IOverlayWindowHost.HitTest(Point dragPoint)
+        {
+            Rect detectionRect = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+            return detectionRect.Contains(dragPoint);
+        }
+
+        DockingManager IOverlayWindowHost.Manager
+        {
+            get { return this; }
+        }
+
+        OverlayWindow _overlayWindow = null;
+        void CreateOverlayWindow()
+        {
+            if (_overlayWindow == null)
+            {
+                _overlayWindow = new OverlayWindow(this);
+            }
+            Rect rectWindow = new Rect(this.PointToScreenDPIWithoutFlowDirection(new Point()), this.TransformActualSizeToAncestor());
+            _overlayWindow.Left = rectWindow.Left;
+            _overlayWindow.Top = rectWindow.Top;
+            _overlayWindow.Width = rectWindow.Width;
+            _overlayWindow.Height = rectWindow.Height;
+        }
+
+        void DestroyOverlayWindow()
+        {
+            if (_overlayWindow != null)
+            {
+                _overlayWindow.Close();
+                _overlayWindow = null;
+            }
+        }
+
+        IOverlayWindow IOverlayWindowHost.ShowOverlayWindow(LayoutFloatingWindowControl draggingWindow)
+        {
+          //Trace.WriteLine("ShowOverlayWindow");
+            CreateOverlayWindow();
+            _overlayWindow.Owner = draggingWindow;
+            _overlayWindow.EnableDropTargets();
+            _overlayWindow.Show();
+            return _overlayWindow;
+        }
+
+        void IOverlayWindowHost.HideOverlayWindow()
+        {
+          //Trace.WriteLine("HideOverlayWindow");
+            _areas = null;
+            _overlayWindow.Owner = null;
+            _overlayWindow.HideDropTargets();
+        }
+
+        List<IDropArea> _areas = null;
+
+        IEnumerable<IDropArea> IOverlayWindowHost.GetDropAreas(LayoutFloatingWindowControl draggingWindow)
+        {
+            if (_areas != null)
+                return _areas;
+
+            bool isDraggingDocuments = draggingWindow.Model is LayoutDocumentFloatingWindow;
+
+            _areas = new List<IDropArea>();
+
+            if (!isDraggingDocuments)
+            {
+                _areas.Add(new DropArea<DockingManager>(
+                    this,
+                    DropAreaType.DockingManager));
+
+                foreach (var areaHost in this.FindVisualChildren<LayoutAnchorablePaneControl>())
+                {
+                    if (areaHost.Model.Descendents().Any())
+                    {
+                        _areas.Add(new DropArea<LayoutAnchorablePaneControl>(
+                            areaHost,
+                            DropAreaType.AnchorablePane));
+                    }
+                }
+            }
+
+            foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneControl>())
+            {
+                _areas.Add(new DropArea<LayoutDocumentPaneControl>(
+                    areaHost,
+                    DropAreaType.DocumentPane));
+            }
+
+            foreach (var areaHost in this.FindVisualChildren<LayoutDocumentPaneGroupControl>())
+            {
+                var documentGroupModel = areaHost.Model as LayoutDocumentPaneGroup;
+                if (documentGroupModel.Children.Where(c => c.IsVisible).Count() == 0)
+                {
+                    _areas.Add(new DropArea<LayoutDocumentPaneGroupControl>(
+                        areaHost,
+                        DropAreaType.DocumentPaneGroup));
+                }
+            }
+
+            return _areas;
+        }
+
+        protected override Size ArrangeOverride(Size arrangeBounds)
+        {
+            _areas = null;
+            return base.ArrangeOverride(arrangeBounds);
+        }
+
+        #endregion
+
+        #region LayoutDocument & LayoutAnchorable Templates
+
+        #region LayoutItemTemplate
+
+        /// <summary>
+        /// LayoutItemTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutItemTemplateProperty =
+            DependencyProperty.Register("LayoutItemTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnLayoutItemTemplateChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorableTemplate property.  This dependency property 
+        /// indicates the template to use to render anchorable and document contents.
+        /// </summary>
+        public DataTemplate LayoutItemTemplate
+        {
+            get { return (DataTemplate)GetValue(LayoutItemTemplateProperty); }
+            set { SetValue(LayoutItemTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorableTemplate property.
+        /// </summary>
+        private static void OnLayoutItemTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutItemTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorableTemplate property.
+        /// </summary>
+        protected virtual void OnLayoutItemTemplateChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+        #region LayoutItemTemplateSelector
+
+        /// <summary>
+        /// LayoutItemTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutItemTemplateSelectorProperty =
+            DependencyProperty.Register("LayoutItemTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnLayoutItemTemplateSelectorChanged)));
+
+        /// <summary>
+        /// Gets or sets the LayoutItemTemplateSelector property.  This dependency property 
+        /// indicates selector object to use for anchorable templates.
+        /// </summary>
+        public DataTemplateSelector LayoutItemTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(LayoutItemTemplateSelectorProperty); }
+            set { SetValue(LayoutItemTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the LayoutItemTemplateSelector property.
+        /// </summary>
+        private static void OnLayoutItemTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutItemTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the LayoutItemTemplateSelector property.
+        /// </summary>
+        protected virtual void OnLayoutItemTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+        }
+
+        #endregion
+
+
+        #endregion
+
+        #region DocumentsSource
+
+        /// <summary>
+        /// DocumentsSource Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentsSourceProperty =
+            DependencyProperty.Register("DocumentsSource", typeof(IEnumerable), typeof(DockingManager),
+                new FrameworkPropertyMetadata((IEnumerable)null,
+                    new PropertyChangedCallback(OnDocumentsSourceChanged)));
+
+        /// <summary>
+        /// Gets or sets the DocumentsSource property.  This dependency property 
+        /// indicates the source collection of documents.
+        /// </summary>
+        public IEnumerable DocumentsSource
+        {
+            get { return (IEnumerable)GetValue(DocumentsSourceProperty); }
+            set { SetValue(DocumentsSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentsSource property.
+        /// </summary>
+        private static void OnDocumentsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentsSourceChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentsSource property.
+        /// </summary>
+        protected virtual void OnDocumentsSourceChanged(DependencyPropertyChangedEventArgs e)
+        {
+            DetachDocumentsSource(Layout, e.OldValue as IEnumerable);
+            AttachDocumentsSource(Layout, e.NewValue as IEnumerable);
+        }
+
+
+        void AttachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
+        {
+            if (documentsSource == null)
+                return;
+
+            if (layout == null)
+                return;
+
+            //if (layout.Descendents().OfType<LayoutDocument>().Any())
+            //    throw new InvalidOperationException("Unable to set the DocumentsSource property if LayoutDocument objects are already present in the model");
+            var documentsImported = layout.Descendents().OfType<LayoutDocument>().Select(d => d.Content).ToArray();
+            var documents = documentsSource as IEnumerable;
+            var listOfDocumentsToImport = new List<object>(documents.OfType<object>());
+
+            foreach (var document in listOfDocumentsToImport.ToArray())
+            {
+                if (documentsImported.Contains(document))
+                    listOfDocumentsToImport.Remove(document);
+            }
+
+
+            LayoutDocumentPane documentPane = null;
+            if (layout.LastFocusedDocument != null)
+            {
+                documentPane = layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+            }
+
+            if (documentPane == null)
+            {
+                documentPane = layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+            }
+
+            //if (documentPane == null)
+            //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+            _suspendLayoutItemCreation = true;
+            foreach (var documentContentToImport in listOfDocumentsToImport)
+            {
+
+                //documentPane.Children.Add(new LayoutDocument() { Content = documentToImport });
+
+                var documentToImport = new LayoutDocument()
+                {
+                    Content = documentContentToImport
+                };
+
+                bool added = false;
+                if (LayoutUpdateStrategy != null)
+                {
+                    added = LayoutUpdateStrategy.BeforeInsertDocument(layout, documentToImport, documentPane);
+                }
+
+                if (!added)
+                {
+                    if (documentPane == null)
+                        throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+                    documentPane.Children.Add(documentToImport);
+                    added = true;
+                }
+
+                if (LayoutUpdateStrategy != null)
+                    LayoutUpdateStrategy.AfterInsertDocument(layout, documentToImport);
+
+
+                CreateDocumentLayoutItem(documentToImport);
+
+            }
+            _suspendLayoutItemCreation = true;
+
+
+            var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
+            if (documentsSourceAsNotifier != null)
+                documentsSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler(documentsSourceElementsChanged);
+        }
+
+        internal bool SuspendDocumentsSourceBinding = false;
+
+        void documentsSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (Layout == null)
+                return;
+
+            //When deserializing documents are created automatically by the deserializer
+            if (SuspendDocumentsSourceBinding)
+                return;
+
+            //handle remove
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.OldItems != null)
+                {
+                    var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
+                    foreach (var documentToRemove in documentsToRemove)
+                    {
+                        (documentToRemove.Parent as ILayoutContainer).RemoveChild(
+                            documentToRemove);
+                    }
+                }
+            }
+
+            //handle add
+            if (e.NewItems != null &&
+                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                if (e.NewItems != null)
+                {
+                    LayoutDocumentPane documentPane = null;
+                    if (Layout.LastFocusedDocument != null)
+                    {
+                        documentPane = Layout.LastFocusedDocument.Parent as LayoutDocumentPane;
+                    }
+
+                    if (documentPane == null)
+                    {
+                        documentPane = Layout.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+                    }
+
+                    //if (documentPane == null)
+                    //    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+                    _suspendLayoutItemCreation = true;
+
+                    foreach (var documentContentToImport in e.NewItems)
+                    {
+                        var documentToImport = new LayoutDocument()
+                        {
+                            Content = documentContentToImport
+                        };
+
+                        bool added = false;
+                        if (LayoutUpdateStrategy != null)
+                        {
+                            added = LayoutUpdateStrategy.BeforeInsertDocument(Layout, documentToImport, documentPane);
+                        }
+
+                        if (!added)
+                        {
+                            if (documentPane == null)
+                                throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+                            documentPane.Children.Add(documentToImport);
+                            added = true;
+                        }
+
+                        if (LayoutUpdateStrategy != null)
+                        {
+                            LayoutUpdateStrategy.AfterInsertDocument(Layout, documentToImport);
+                        }
+
+
+                        var root = documentToImport.Root;
+
+                        if (root != null && root.Manager == this)
+                        {
+                            CreateDocumentLayoutItem(documentToImport);
+                        }
+                    }
+                    _suspendLayoutItemCreation = false;
+                }
+            }
+
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                //NOTE: I'm going to clear every document present in layout but
+                //some documents may have been added directly to the layout, for now I clear them too
+                var documentsToRemove = Layout.Descendents().OfType<LayoutDocument>().ToArray();
+                foreach (var documentToRemove in documentsToRemove)
+                {
+                    (documentToRemove.Parent as ILayoutContainer).RemoveChild(
+                        documentToRemove);
+                }
+            }
+
+            if (Layout != null)
+            {
+                Layout.CollectGarbage();
+            }
+        }
+
+        void DetachDocumentsSource(LayoutRoot layout, IEnumerable documentsSource)
+        {
+            if (documentsSource == null)
+                return;
+
+            if (layout == null)
+                return;
+
+            var documentsToRemove = layout.Descendents().OfType<LayoutDocument>()
+                .Where(d => documentsSource.Contains(d.Content)).ToArray();
+
+            foreach (var documentToRemove in documentsToRemove)
+            {
+                (documentToRemove.Parent as ILayoutContainer).RemoveChild(
+                    documentToRemove);
+            }
+
+            var documentsSourceAsNotifier = documentsSource as INotifyCollectionChanged;
+            if (documentsSourceAsNotifier != null)
+                documentsSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler(documentsSourceElementsChanged);
+        }
+
+
+        #endregion
+
+        #region DocumentCloseCommand
+
+        internal void _ExecuteCloseCommand(LayoutDocument document)
+        {
+            if (DocumentClosing != null)
+            {
+                var evargs = new DocumentClosingEventArgs(document);
+                DocumentClosing(this, evargs);
+                if (evargs.Cancel)
+                    return;
+            }
+
+            if (!document.TestCanClose())
+                return;
+
+            document.Close();
+
+            if (DocumentClosed != null)
+            { 
+                var evargs = new DocumentClosedEventArgs(document);
+                DocumentClosed(this, evargs);
+            }
+        }
+
+        /// <summary>
+        /// Event fired when a document is about to be closed
+        /// </summary>
+        /// <remarks>Subscribers have the opportuniy to cancel the operation.</remarks>
+        public event EventHandler<DocumentClosingEventArgs> DocumentClosing;
+
+        /// <summary>
+        /// Event fired after a document is closed
+        /// </summary>
+        public event EventHandler<DocumentClosedEventArgs> DocumentClosed;
+
+
+
+        #endregion
+
+        internal void _ExecuteCloseAllButThisCommand(LayoutContent contentSelected)
+        {
+            foreach (var contentToClose in Layout.Descendents().OfType<LayoutContent>().Where(d => d != contentSelected && (d.Parent is LayoutDocumentPane || d.Parent is LayoutDocumentFloatingWindow)).ToArray())
+            {
+                if (!contentToClose.CanClose)
+                    continue;
+
+                var layoutItem = GetLayoutItemFromModel(contentToClose);
+                if (layoutItem.CloseCommand != null)
+                {
+                    if (layoutItem.CloseCommand.CanExecute(null))
+                        layoutItem.CloseCommand.Execute(null);
+                }
+                else
+                {
+                    if (contentToClose is LayoutDocument)
+                        _ExecuteCloseCommand(contentToClose as LayoutDocument);
+                    else if (contentToClose is LayoutAnchorable)
+                        _ExecuteCloseCommand(contentToClose as LayoutAnchorable);
+                }
+            }
+        }
+
+        #region DocumentContextMenu
+
+        /// <summary>
+        /// DocumentContextMenu Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentContextMenuProperty =
+            DependencyProperty.Register("DocumentContextMenu", typeof(ContextMenu), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ContextMenu)null));
+
+        /// <summary>
+        /// Gets or sets the DocumentContextMenu property.  This dependency property 
+        /// indicates context menu to show for documents.
+        /// </summary>
+        public ContextMenu DocumentContextMenu
+        {
+            get { return (ContextMenu)GetValue(DocumentContextMenuProperty); }
+            set { SetValue(DocumentContextMenuProperty, value); }
+        }
+
+        #endregion
+
+        #region AnchorablesSource
+
+        /// <summary>
+        /// AnchorablesSource Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorablesSourceProperty =
+            DependencyProperty.Register("AnchorablesSource", typeof(IEnumerable), typeof(DockingManager),
+                new FrameworkPropertyMetadata((IEnumerable)null,
+                    new PropertyChangedCallback(OnAnchorablesSourceChanged)));
+
+        /// <summary>
+        /// Gets or sets the AnchorablesSource property.  This dependency property 
+        /// indicates source collection of anchorables.
+        /// </summary>
+        public IEnumerable AnchorablesSource
+        {
+            get { return (IEnumerable)GetValue(AnchorablesSourceProperty); }
+            set { SetValue(AnchorablesSourceProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the AnchorablesSource property.
+        /// </summary>
+        private static void OnAnchorablesSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnAnchorablesSourceChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the AnchorablesSource property.
+        /// </summary>
+        protected virtual void OnAnchorablesSourceChanged(DependencyPropertyChangedEventArgs e)
+        {
+            DetachAnchorablesSource(Layout, e.OldValue as IEnumerable);
+            AttachAnchorablesSource(Layout, e.NewValue as IEnumerable);
+        }
+
+        void AttachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
+        {
+            if (anchorablesSource == null)
+                return;
+
+            if (layout == null)
+                return;
+
+            //if (layout.Descendents().OfType<LayoutAnchorable>().Any())
+            //    throw new InvalidOperationException("Unable to set the AnchorablesSource property if LayoutAnchorable objects are already present in the model");
+            var anchorablesImported = layout.Descendents().OfType<LayoutAnchorable>().Select(d => d.Content).ToArray();
+            var anchorables = anchorablesSource as IEnumerable;
+            var listOfAnchorablesToImport = new List<object>(anchorables.OfType<object>());
+
+            foreach (var document in listOfAnchorablesToImport.ToArray())
+            {
+                if (anchorablesImported.Contains(document))
+                    listOfAnchorablesToImport.Remove(document);
+            }
+
+            LayoutAnchorablePane anchorablePane = null;
+            if (layout.ActiveContent != null)
+            {
+                //look for active content parent pane
+                anchorablePane = layout.ActiveContent.Parent as LayoutAnchorablePane;
+            }
+
+            if (anchorablePane == null)
+            {
+                //look for a pane on the right side
+                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
+            }
+
+            if (anchorablePane == null)
+            {
+                //look for an available pane
+                anchorablePane = layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+            }
+
+            _suspendLayoutItemCreation = true;
+            foreach (var anchorableContentToImport in listOfAnchorablesToImport)
+            {
+                var anchorableToImport = new LayoutAnchorable()
+                {
+                    Content = anchorableContentToImport
+                };
+
+                bool added = false;
+                if (LayoutUpdateStrategy != null)
+                {
+                    added = LayoutUpdateStrategy.BeforeInsertAnchorable(layout, anchorableToImport, anchorablePane);
+                }
+
+                if (!added)
+                {
+                    if (anchorablePane == null)
+                    {
+                        var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                        if (layout.RootPanel != null)
+                        {
+                            mainLayoutPanel.Children.Add(layout.RootPanel);
+                        }
+
+                        layout.RootPanel = mainLayoutPanel;
+                        anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
+                        mainLayoutPanel.Children.Add(anchorablePane);
+                    }
+
+                    anchorablePane.Children.Add(anchorableToImport);
+                    added = true;
+                }
+
+                if (LayoutUpdateStrategy != null)
+                    LayoutUpdateStrategy.AfterInsertAnchorable(layout, anchorableToImport);
+
+
+                CreateAnchorableLayoutItem(anchorableToImport);
+
+            }
+
+            _suspendLayoutItemCreation = false;
+
+            var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
+            if (anchorablesSourceAsNotifier != null)
+                anchorablesSourceAsNotifier.CollectionChanged += new NotifyCollectionChangedEventHandler(anchorablesSourceElementsChanged);
+        }
+
+        internal bool SuspendAnchorablesSourceBinding = false;
+
+        void anchorablesSourceElementsChanged(object sender, NotifyCollectionChangedEventArgs e)
+        {
+            if (Layout == null)
+                return;
+
+            //When deserializing documents are created automatically by the deserializer
+            if (SuspendAnchorablesSourceBinding)
+                return;
+
+            //handle remove
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.OldItems != null)
+                {
+                    var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().Where(d => e.OldItems.Contains(d.Content)).ToArray();
+                    foreach (var anchorableToRemove in anchorablesToRemove)
+                    {
+                        (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
+                            anchorableToRemove);
+                    }
+                }
+            }
+
+            //handle add
+            if (e.NewItems != null &&
+                (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                if (e.NewItems != null)
+                {
+                    LayoutAnchorablePane anchorablePane = null;
+
+                    if (Layout.ActiveContent != null)
+                    {
+                        //look for active content parent pane
+                        anchorablePane = Layout.ActiveContent.Parent as LayoutAnchorablePane;
+                    }
+
+                    if (anchorablePane == null)
+                    {
+                        //look for a pane on the right side
+                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
+                    }
+
+                    if (anchorablePane == null)
+                    {
+                        //look for an available pane
+                        anchorablePane = Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+                    }
+
+                    _suspendLayoutItemCreation = true;
+                    foreach (var anchorableContentToImport in e.NewItems)
+                    {
+                        var anchorableToImport = new LayoutAnchorable()
+                        {
+                            Content = anchorableContentToImport
+                        };
+
+                        bool added = false;
+                        if (LayoutUpdateStrategy != null)
+                        {
+                            added = LayoutUpdateStrategy.BeforeInsertAnchorable(Layout, anchorableToImport, anchorablePane);
+                        }
+
+                        if (!added)
+                        {
+                            if (anchorablePane == null)
+                            {
+                                var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                                if (Layout.RootPanel != null)
+                                {
+                                    mainLayoutPanel.Children.Add(Layout.RootPanel);
+                                }
+
+                                Layout.RootPanel = mainLayoutPanel;
+                                anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
+                                mainLayoutPanel.Children.Add(anchorablePane);
+                            }
+
+                            anchorablePane.Children.Add(anchorableToImport);
+                            added = true;
+                        }
+
+                        if (LayoutUpdateStrategy != null)
+                        {
+                            LayoutUpdateStrategy.AfterInsertAnchorable(Layout, anchorableToImport);
+                        }
+
+                        var root = anchorableToImport.Root;
+
+                        if (root != null && root.Manager == this)
+                        {
+                            CreateAnchorableLayoutItem(anchorableToImport);
+                        }
+
+                    }
+                    _suspendLayoutItemCreation = false;
+                }
+            }
+
+            if (e.Action == NotifyCollectionChangedAction.Reset)
+            {
+                //NOTE: I'm going to clear every anchorable present in layout but
+                //some anchorable may have been added directly to the layout, for now I clear them too
+                var anchorablesToRemove = Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
+                foreach (var anchorableToRemove in anchorablesToRemove)
+                {
+                    (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
+                        anchorableToRemove);
+                }
+            }
+
+            if (Layout != null)
+                Layout.CollectGarbage();
+        }
+
+        void DetachAnchorablesSource(LayoutRoot layout, IEnumerable anchorablesSource)
+        {
+            if (anchorablesSource == null)
+                return;
+
+            if (layout == null)
+                return;
+
+            var anchorablesToRemove = layout.Descendents().OfType<LayoutAnchorable>()
+                .Where(d => anchorablesSource.Contains(d.Content)).ToArray();
+
+            foreach (var anchorableToRemove in anchorablesToRemove)
+            {
+                (anchorableToRemove.Parent as ILayoutContainer).RemoveChild(
+                    anchorableToRemove);
+            }
+
+            var anchorablesSourceAsNotifier = anchorablesSource as INotifyCollectionChanged;
+            if (anchorablesSourceAsNotifier != null)
+                anchorablesSourceAsNotifier.CollectionChanged -= new NotifyCollectionChangedEventHandler(anchorablesSourceElementsChanged);
+        }
+
+        #endregion
+
+        internal void _ExecuteCloseCommand(LayoutAnchorable anchorable)
+        {
+            var model = anchorable as LayoutAnchorable;
+            if (model != null && model.TestCanClose())
+            {
+                if (model.IsAutoHidden)
+                    model.ToggleAutoHide();
+
+                model.Close();
+                return;
+            }
+        }
+
+        internal void _ExecuteHideCommand(LayoutAnchorable anchorable)
+        {
+            var model = anchorable as LayoutAnchorable;
+            if (model != null)
+            {
+                //by default hide the anchorable
+                model.Hide();
+            }
+        }
+
+        internal void _ExecuteAutoHideCommand(LayoutAnchorable _anchorable)
+        {
+            _anchorable.ToggleAutoHide();
+        }
+
+        internal void _ExecuteFloatCommand(LayoutContent contentToFloat)
+        {
+            contentToFloat.Float();
+        }
+
+        internal void _ExecuteDockCommand(LayoutAnchorable anchorable)
+        {
+            anchorable.Dock();
+        }
+
+        internal void _ExecuteDockAsDocumentCommand(LayoutContent content)
+        {
+            content.DockAsDocument();
+        }
+
+        #region ActiveContent
+
+        /// <summary>
+        /// ActiveContent Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ActiveContentProperty =
+            DependencyProperty.Register("ActiveContent", typeof(object), typeof(DockingManager),
+                new FrameworkPropertyMetadata((object)null,
+                    new PropertyChangedCallback(OnActiveContentChanged)));
+
+        /// <summary>
+        /// Gets or sets the ActiveContent property.  This dependency property 
+        /// indicates the content currently active.
+        /// </summary>
+        public object ActiveContent
+        {
+            get { return (object)GetValue(ActiveContentProperty); }
+            set { SetValue(ActiveContentProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the ActiveContent property.
+        /// </summary>
+        private static void OnActiveContentChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).InternalSetActiveContent(e.NewValue);
+            ((DockingManager)d).OnActiveContentChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the ActiveContent property.
+        /// </summary>
+        protected virtual void OnActiveContentChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (ActiveContentChanged != null)
+                ActiveContentChanged(this, EventArgs.Empty);
+        }
+
+
+        bool _insideInternalSetActiveContent = false;
+        void InternalSetActiveContent(object contentObject)
+        {
+            var layoutContent = Layout.Descendents().OfType<LayoutContent>().FirstOrDefault(lc => lc == contentObject || lc.Content == contentObject);
+            _insideInternalSetActiveContent = true;
+            Layout.ActiveContent = layoutContent;
+            _insideInternalSetActiveContent = false;
+        }
+
+        public event EventHandler ActiveContentChanged;
+
+        #endregion
+
+        #region AnchorableContextMenu
+
+        /// <summary>
+        /// AnchorableContextMenu Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AnchorableContextMenuProperty =
+            DependencyProperty.Register("AnchorableContextMenu", typeof(ContextMenu), typeof(DockingManager),
+                new FrameworkPropertyMetadata((ContextMenu)null));
+
+        /// <summary>
+        /// Gets or sets the AnchorableContextMenu property.  This dependency property 
+        /// indicates the context menu to show up for anchorables.
+        /// </summary>
+        public ContextMenu AnchorableContextMenu
+        {
+            get { return (ContextMenu)GetValue(AnchorableContextMenuProperty); }
+            set { SetValue(AnchorableContextMenuProperty, value); }
+        }
+
+        #endregion
+
+        #region Theme
+
+        /// <summary>
+        /// Theme Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ThemeProperty =
+            DependencyProperty.Register("Theme", typeof(Theme), typeof(DockingManager),
+                new FrameworkPropertyMetadata(null,
+                    new PropertyChangedCallback(OnThemeChanged)));
+
+        /// <summary>
+        /// Gets or sets the Theme property.  This dependency property 
+        /// indicates the theme to use for AvalonDock controls.
+        /// </summary>
+        public Theme Theme
+        {
+            get { return (Theme)GetValue(ThemeProperty); }
+            set { SetValue(ThemeProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the Theme property.
+        /// </summary>
+        private static void OnThemeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnThemeChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Theme property.
+        /// </summary>
+        protected virtual void OnThemeChanged(DependencyPropertyChangedEventArgs e)
+        {
+            var oldTheme = e.OldValue as Theme;
+            var newTheme = e.NewValue as Theme;
+            var resources = this.Resources;
+            if (oldTheme != null)
+            {
+                var resourceDictionaryToRemove =
+                    resources.MergedDictionaries.FirstOrDefault(r => r.Source == oldTheme.GetResourceUri());
+                if (resourceDictionaryToRemove != null)
+                    resources.MergedDictionaries.Remove(
+                        resourceDictionaryToRemove);
+            }
+
+            if (newTheme != null)
+            {
+                resources.MergedDictionaries.Add(new ResourceDictionary() { Source = newTheme.GetResourceUri() });
+            }
+
+            foreach (var fwc in _fwList)
+                fwc.UpdateThemeResources(oldTheme);
+
+            if (_navigatorWindow != null)
+                _navigatorWindow.UpdateThemeResources();
+
+            if (_overlayWindow != null)
+                _overlayWindow.UpdateThemeResources();
+        }
+
+        #endregion
+
+        #region GridSplitterWidth
+
+        /// <summary>
+        /// GridSplitterWidth Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty GridSplitterWidthProperty =
+            DependencyProperty.Register("GridSplitterWidth", typeof(double), typeof(DockingManager),
+                new FrameworkPropertyMetadata((double)6.0));
+
+        /// <summary>
+        /// Gets or sets the GridSplitterWidth property.  This dependency property 
+        /// indicates width of grid splitters.
+        /// </summary>
+        public double GridSplitterWidth
+        {
+            get { return (double)GetValue(GridSplitterWidthProperty); }
+            set { SetValue(GridSplitterWidthProperty, value); }
+        }
+
+        #endregion
+
+        #region GridSplitterHeight
+
+        /// <summary>
+        /// GridSplitterHeight Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty GridSplitterHeightProperty =
+            DependencyProperty.Register("GridSplitterHeight", typeof(double), typeof(DockingManager),
+                new FrameworkPropertyMetadata((double)6.0));
+
+        /// <summary>
+        /// Gets or sets the GridSplitterHeight property.  This dependency property 
+        /// indicates height of grid splitters.
+        /// </summary>
+        public double GridSplitterHeight
+        {
+            get { return (double)GetValue(GridSplitterHeightProperty); }
+            set { SetValue(GridSplitterHeightProperty, value); }
+        }
+
+        #endregion
+
+        internal void _ExecuteContentActivateCommand(LayoutContent content)
+        {
+            content.IsActive = true;
+        }
+
+        #region DocumentPaneMenuItemHeaderTemplate
+
+        /// <summary>
+        /// DocumentPaneMenuItemHeaderTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateProperty =
+            DependencyProperty.Register("DocumentPaneMenuItemHeaderTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null,
+                    new PropertyChangedCallback(OnDocumentPaneMenuItemHeaderTemplateChanged),
+                    new CoerceValueCallback(CoerceDocumentPaneMenuItemHeaderTemplateValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentPaneMenuItemHeaderTemplate property.  This dependency property 
+        /// indicates the header template to use while creating menu items for the document panes.
+        /// </summary>
+        public DataTemplate DocumentPaneMenuItemHeaderTemplate
+        {
+            get { return (DataTemplate)GetValue(DocumentPaneMenuItemHeaderTemplateProperty); }
+            set { SetValue(DocumentPaneMenuItemHeaderTemplateProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentPaneMenuItemHeaderTemplate property.
+        /// </summary>
+        private static void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplate property.
+        /// </summary>
+        protected virtual void OnDocumentPaneMenuItemHeaderTemplateChanged(DependencyPropertyChangedEventArgs e)
+        { 
+        }
+
+        /// <summary>
+        /// Coerces the DocumentPaneMenuItemHeaderTemplate value.
+        /// </summary>
+        private static object CoerceDocumentPaneMenuItemHeaderTemplateValue(DependencyObject d, object value)
+        {
+            if (value != null &&
+                d.GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty) != null)
+                return null;
+            if (value == null)
+                return d.GetValue(DocumentHeaderTemplateProperty);
+
+            return value;
+        }
+
+        #endregion
+
+        #region DocumentPaneMenuItemHeaderTemplateSelector
+
+        /// <summary>
+        /// DocumentPaneMenuItemHeaderTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty DocumentPaneMenuItemHeaderTemplateSelectorProperty =
+            DependencyProperty.Register("DocumentPaneMenuItemHeaderTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null,
+                    new PropertyChangedCallback(OnDocumentPaneMenuItemHeaderTemplateSelectorChanged),
+                    new CoerceValueCallback(CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue)));
+
+        /// <summary>
+        /// Gets or sets the DocumentPaneMenuItemHeaderTemplateSelector property.  This dependency property 
+        /// indicates the data template selector to use for the menu items show when user select the DocumentPane document switch context menu.
+        /// </summary>
+        public DataTemplateSelector DocumentPaneMenuItemHeaderTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty); }
+            set { SetValue(DocumentPaneMenuItemHeaderTemplateSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
+        /// </summary>
+        private static void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the DocumentPaneMenuItemHeaderTemplateSelector property.
+        /// </summary>
+        protected virtual void OnDocumentPaneMenuItemHeaderTemplateSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            if (e.NewValue != null &&
+                DocumentPaneMenuItemHeaderTemplate != null)
+                DocumentPaneMenuItemHeaderTemplate = null;
+
+        }
+
+        /// <summary>
+        /// Coerces the DocumentPaneMenuItemHeaderTemplateSelector value.
+        /// </summary>
+        private static object CoerceDocumentPaneMenuItemHeaderTemplateSelectorValue(DependencyObject d, object value)
+        {
+            return value;
+        }
+
+        #endregion
+
+        #region IconContentTemplate
+
+        /// <summary>
+        /// IconContentTemplate Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IconContentTemplateProperty =
+            DependencyProperty.Register("IconContentTemplate", typeof(DataTemplate), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplate)null));
+
+        /// <summary>
+        /// Gets or sets the IconContentTemplate property.  This dependency property 
+        /// indicates the data template to use while extracting the icon from model.
+        /// </summary>
+        public DataTemplate IconContentTemplate
+        {
+            get { return (DataTemplate)GetValue(IconContentTemplateProperty); }
+            set { SetValue(IconContentTemplateProperty, value); }
+        }
+
+        #endregion
+
+        #region IconContentTemplateSelector
+
+        /// <summary>
+        /// IconContentTemplateSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty IconContentTemplateSelectorProperty =
+            DependencyProperty.Register("IconContentTemplateSelector", typeof(DataTemplateSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((DataTemplateSelector)null));
+
+        /// <summary>
+        /// Gets or sets the IconContentTemplateSelector property.  This dependency property 
+        /// indicates data template selector to use while selecting the datatamplate for content icons.
+        /// </summary>
+        public DataTemplateSelector IconContentTemplateSelector
+        {
+            get { return (DataTemplateSelector)GetValue(IconContentTemplateSelectorProperty); }
+            set { SetValue(IconContentTemplateSelectorProperty, value); }
+        }
+
+        #endregion
+
+        #region LayoutItems
+
+        List<LayoutItem> _layoutItems = new List<LayoutItem>();
+
+        bool _suspendLayoutItemCreation = false;
+
+        void DetachLayoutItems()
+        {
+            if (Layout != null)
+            {
+                _layoutItems.ForEach<LayoutItem>(i => i.Detach());
+                _layoutItems.Clear();
+                Layout.ElementAdded -= new EventHandler<LayoutElementEventArgs>(Layout_ElementAdded);
+                Layout.ElementRemoved -= new EventHandler<LayoutElementEventArgs>(Layout_ElementRemoved);
+            }
+        }
+
+        void Layout_ElementRemoved(object sender, LayoutElementEventArgs e)
+        {
+            if (_suspendLayoutItemCreation)
+                return;
+
+            CollectLayoutItemsDeleted();
+        }
+
+        void Layout_ElementAdded(object sender, LayoutElementEventArgs e)
+        {
+            if (_suspendLayoutItemCreation)
+                return;
+
+            foreach (var content in Layout.Descendents().OfType<LayoutContent>())
+            {
+                if (content is LayoutDocument)
+                    CreateDocumentLayoutItem(content as LayoutDocument);
+                else //if (content is LayoutAnchorable)
+                    CreateAnchorableLayoutItem(content as LayoutAnchorable);
+            }
+
+            CollectLayoutItemsDeleted();
+        }
+
+
+        DispatcherOperation _collectLayoutItemsOperations = null;
+        void CollectLayoutItemsDeleted()
+        {
+            if (_collectLayoutItemsOperations != null)
+                return;
+            _collectLayoutItemsOperations = Dispatcher.BeginInvoke(new Action(() =>
+                {
+                    _collectLayoutItemsOperations = null;
+                    foreach (var itemToRemove in _layoutItems.Where(item => item.LayoutElement.Root != Layout).ToArray())
+                    {
+
+                        if (itemToRemove != null &&
+                            itemToRemove.Model != null &&
+                            itemToRemove.Model is UIElement)
+                        {
+                            //((ILogicalChildrenContainer)this).InternalRemoveLogicalChild(itemToRemove.Model as UIElement);
+                        }
+
+                        itemToRemove.Detach();
+                        _layoutItems.Remove(itemToRemove);
+
+                    }
+                }));
+        }
+
+
+        void AttachLayoutItems()
+        {
+            if (Layout != null)
+            {
+                foreach (var document in Layout.Descendents().OfType<LayoutDocument>().ToArray())
+                {
+                    CreateDocumentLayoutItem(document);
+                    //var documentItem = new LayoutDocumentItem();
+                    //documentItem.Attach(document);
+                    //ApplyStyleToLayoutItem(documentItem);
+                    //_layoutItems.Add(documentItem);
+                }
+                foreach (var anchorable in Layout.Descendents().OfType<LayoutAnchorable>().ToArray())
+                {
+                    CreateAnchorableLayoutItem(anchorable);
+                    //var anchorableItem = new LayoutAnchorableItem();
+                    //anchorableItem.Attach(anchorable);
+                    //ApplyStyleToLayoutItem(anchorableItem);
+                    //_layoutItems.Add(anchorableItem);
+                }
+
+                Layout.ElementAdded += new EventHandler<LayoutElementEventArgs>(Layout_ElementAdded);
+                Layout.ElementRemoved += new EventHandler<LayoutElementEventArgs>(Layout_ElementRemoved);
+            }
+        }
+
+        void ApplyStyleToLayoutItem(LayoutItem layoutItem)
+        {
+            layoutItem._ClearDefaultBindings();
+            if (LayoutItemContainerStyle != null)
+                layoutItem.Style = LayoutItemContainerStyle;
+            else if (LayoutItemContainerStyleSelector != null)
+                layoutItem.Style = LayoutItemContainerStyleSelector.SelectStyle(layoutItem.Model, layoutItem);
+            layoutItem._SetDefaultBindings();
+        }
+
+        void CreateAnchorableLayoutItem(LayoutAnchorable contentToAttach)
+        {
+            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
+                return;
+
+            var layoutItem = new LayoutAnchorableItem();
+            layoutItem.Attach(contentToAttach);
+            ApplyStyleToLayoutItem(layoutItem);
+            _layoutItems.Add(layoutItem);
+
+            if (contentToAttach != null &&
+                contentToAttach.Content != null &&
+                contentToAttach.Content is UIElement)
+            {
+                InternalAddLogicalChild(contentToAttach.Content);
+            }
+
+        }
+
+        void CreateDocumentLayoutItem(LayoutDocument contentToAttach)
+        {
+            if (_layoutItems.Any(item => item.LayoutElement == contentToAttach))
+                return;
+
+            var layoutItem = new LayoutDocumentItem();
+            layoutItem.Attach(contentToAttach);
+            ApplyStyleToLayoutItem(layoutItem);
+            _layoutItems.Add(layoutItem);
+
+            if (contentToAttach != null &&
+                contentToAttach.Content != null &&
+                contentToAttach.Content is UIElement)
+            {
+                InternalAddLogicalChild(contentToAttach.Content);
+            }
+
+        }
+
+        #region LayoutItemContainerStyle
+
+        /// <summary>
+        /// LayoutItemContainerStyle Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutItemContainerStyleProperty =
+            DependencyProperty.Register("LayoutItemContainerStyle", typeof(Style), typeof(DockingManager),
+                new FrameworkPropertyMetadata((Style)null,
+                    new PropertyChangedCallback(OnLayoutItemContainerStyleChanged)));
+
+        /// <summary>
+        /// Gets or sets the LayoutItemContainerStyle property.  This dependency property 
+        /// indicates the style to apply to LayoutDocumentItem objects. A LayoutDocumentItem object is created when a new LayoutDocument is created inside the current Layout.
+        /// </summary>
+        public Style LayoutItemContainerStyle
+        {
+            get { return (Style)GetValue(LayoutItemContainerStyleProperty); }
+            set { SetValue(LayoutItemContainerStyleProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the LayoutItemContainerStyle property.
+        /// </summary>
+        private static void OnLayoutItemContainerStyleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutItemContainerStyleChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyle property.
+        /// </summary>
+        protected virtual void OnLayoutItemContainerStyleChanged(DependencyPropertyChangedEventArgs e)
+        {
+            AttachLayoutItems();
+        }
+
+        #endregion
+
+        #region LayoutItemContainerStyleSelector
+
+        /// <summary>
+        /// LayoutItemContainerStyleSelector Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty LayoutItemContainerStyleSelectorProperty =
+            DependencyProperty.Register("LayoutItemContainerStyleSelector", typeof(StyleSelector), typeof(DockingManager),
+                new FrameworkPropertyMetadata((StyleSelector)null,
+                    new PropertyChangedCallback(OnLayoutItemContainerStyleSelectorChanged)));
+
+        /// <summary>
+        /// Gets or sets the LayoutItemContainerStyleSelector property.  This dependency property 
+        /// indicates style selector of the LayoutDocumentItemStyle.
+        /// </summary>
+        public StyleSelector LayoutItemContainerStyleSelector
+        {
+            get { return (StyleSelector)GetValue(LayoutItemContainerStyleSelectorProperty); }
+            set { SetValue(LayoutItemContainerStyleSelectorProperty, value); }
+        }
+
+        /// <summary>
+        /// Handles changes to the LayoutItemContainerStyleSelector property.
+        /// </summary>
+        private static void OnLayoutItemContainerStyleSelectorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            ((DockingManager)d).OnLayoutItemContainerStyleSelectorChanged(e);
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the LayoutItemContainerStyleSelector property.
+        /// </summary>
+        protected virtual void OnLayoutItemContainerStyleSelectorChanged(DependencyPropertyChangedEventArgs e)
+        {
+            AttachLayoutItems();
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Return the LayoutItem wrapper for the content passed as argument
+        /// </summary>
+        /// <param name="content">LayoutContent to search</param>
+        /// <returns>Either a LayoutAnchorableItem or LayoutDocumentItem which contains the LayoutContent passed as argument</returns>
+        public LayoutItem GetLayoutItemFromModel(LayoutContent content)
+        {
+            return _layoutItems.FirstOrDefault(item => item.LayoutElement == content);
+        }
+        #endregion
+
+        #region NavigatorWindow
+        NavigatorWindow _navigatorWindow = null;
+
+        void ShowNavigatorWindow()
+        {
+            if (_navigatorWindow == null)
+            {
+                _navigatorWindow = new NavigatorWindow(this)
+                { 
+                    Owner = Window.GetWindow(this),
+                    WindowStartupLocation = WindowStartupLocation.CenterOwner
+                };
+            }
+
+            _navigatorWindow.ShowDialog();
+            _navigatorWindow = null;
+
+            Trace.WriteLine( "ShowNavigatorWindow()" );
+        }
+
+        bool IsNavigatorWindowActive
+        {
+            get { return _navigatorWindow != null; }
+        }
+
+
+        protected override void OnPreviewKeyDown(KeyEventArgs e)
+        {
+          Trace.WriteLine( string.Format( "OnPreviewKeyDown({0})", e.Key ) );
+            if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
+            {
+                if (e.IsDown && e.Key == Key.Tab)
+                {
+                    if (!IsNavigatorWindowActive)
+                    {
+                        ShowNavigatorWindow();
+                        e.Handled = true;
+                    }
+                }
+            }
+
+            base.OnPreviewKeyDown(e);
+        }
+
+        #endregion
+
+        #region ShowSystemMenu
+
+        /// <summary>
+        /// ShowSystemMenu Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty ShowSystemMenuProperty =
+            DependencyProperty.Register("ShowSystemMenu", typeof(bool), typeof(DockingManager),
+                new FrameworkPropertyMetadata((bool)true));
+
+        /// <summary>
+        /// Gets or sets the ShowSystemMenu property.  This dependency property 
+        /// indicates if floating windows should show the system menu when a custom context menu is not defined.
+        /// </summary>
+        public bool ShowSystemMenu
+        {
+            get { return (bool)GetValue(ShowSystemMenuProperty); }
+            set { SetValue(ShowSystemMenuProperty, value); }
+        }
+
+        #endregion
+
+        #region AllowMixedOrientation
+
+        /// <summary>
+        /// AllowMixedOrientation Dependency Property
+        /// </summary>
+        public static readonly DependencyProperty AllowMixedOrientationProperty =
+            DependencyProperty.Register("AllowMixedOrientation", typeof(bool), typeof(DockingManager),
+                new FrameworkPropertyMetadata((bool)false));
+
+        /// <summary>
+        /// Gets or sets the AllowMixedOrientation property.  This dependency property 
+        /// indicates if the manager should allow mixed orientation for document panes.
+        /// </summary>
+        public bool AllowMixedOrientation
+        {
+            get { return (bool)GetValue(AllowMixedOrientationProperty); }
+            set { SetValue(AllowMixedOrientationProperty, value); }
+        }
+
+        #endregion
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
new file mode 100644
index 000000000..980bb0be8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
@@ -0,0 +1,38 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    public class DocumentClosedEventArgs : EventArgs
+    {
+        public DocumentClosedEventArgs(LayoutDocument document)
+        {
+            Document = document;
+        }
+
+        public LayoutDocument Document
+        {
+            get;
+            private set;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
new file mode 100644
index 000000000..5c87d960d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
@@ -0,0 +1,39 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    public class DocumentClosingEventArgs : CancelEventArgs
+    {
+        public DocumentClosingEventArgs(LayoutDocument document)
+        {
+            Document = document;
+        }
+
+        public LayoutDocument Document
+        {
+            get;
+            private set;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
new file mode 100644
index 000000000..5f998ee05
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
@@ -0,0 +1,60 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    internal static class Extensions
+    {
+        public static bool Contains(this IEnumerable collection, object item)
+        {
+            foreach (var o in collection)
+                if (o == item)
+                    return true;
+
+            return false;
+        }
+
+
+        public static void ForEach<T>(this IEnumerable<T> collection, Action<T> action)
+        {
+            foreach (T v in collection)
+                action(v);
+        }
+
+
+        public static int IndexOf<T>(this T[] array, T value) where T : class
+        {
+            for (int i = 0; i < array.Length; i++)
+                if (array[i] == value)
+                    return i;
+
+            return -1;
+        }
+
+        public static V GetValueOrDefault<V>(this WeakReference wr)
+        {
+            if (wr == null || !wr.IsAlive)
+                return default(V);
+            return (V)wr.Target;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
new file mode 100644
index 000000000..d024cb2c4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
@@ -0,0 +1,34 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public enum AnchorSide
+    {
+        Left,
+
+        Top,
+
+        Right,
+
+        Bottom
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
new file mode 100644
index 000000000..5b758db84
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Flags]
+    public enum AnchorableShowStrategy : byte
+    {
+        Most  = 0x0001,
+        Left  = 0x0002,
+        Right = 0x0004,
+        Top   = 0x0010,
+        Bottom= 0x0020,
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
new file mode 100644
index 000000000..d36b9c516
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
@@ -0,0 +1,46 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public enum ChildrenTreeChange
+    {
+        /// <summary>
+        /// Direct insert/remove operation has been perfomed to the group
+        /// </summary>
+        DirectChildrenChanged,
+
+        /// <summary>
+        /// An element below in the hierarchy as been added/removed
+        /// </summary>
+        TreeChanged
+    }
+
+    public class ChildrenTreeChangedEventArgs : EventArgs
+    {
+        public ChildrenTreeChangedEventArgs(ChildrenTreeChange change)
+        {
+            Change = change;
+        }
+
+        public ChildrenTreeChange Change { get; private set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
new file mode 100644
index 000000000..8cb5ac3e3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
@@ -0,0 +1,169 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public static class Extensions
+    {
+        public static IEnumerable<ILayoutElement> Descendents(this ILayoutElement element)
+        {
+            var container = element as ILayoutContainer;
+            if (container != null)
+            {
+                foreach (var childElement in container.Children)
+                {
+                    yield return childElement;
+                    foreach (var childChildElement in childElement.Descendents())
+                        yield return childChildElement;
+                }
+            }
+        }
+
+        public static T FindParent<T>(this ILayoutElement element) //where T : ILayoutContainer
+        { 
+            var parent = element.Parent;
+            while (parent != null &&
+                !(parent is T))
+                parent = parent.Parent;
+
+
+            return (T)parent;
+        }
+
+        public static ILayoutRoot GetRoot(this ILayoutElement element) //where T : ILayoutContainer
+        {
+            if (element is ILayoutRoot)
+                return element as ILayoutRoot;
+
+            var parent = element.Parent;
+            while (parent != null &&
+                !(parent is ILayoutRoot))
+                parent = parent.Parent;
+
+            return (ILayoutRoot)parent;
+        }
+
+        public static bool ContainsChildOfType<T>(this ILayoutContainer element)
+        {
+            foreach (var childElement in element.Descendents())
+                if (childElement is T)
+                    return true;
+
+            return false;
+        }
+
+        public static bool ContainsChildOfType<T, S>(this ILayoutContainer container)
+        {
+            foreach (var childElement in container.Descendents())
+                if (childElement is T || childElement is S)
+                    return true;
+
+            return false;
+        }
+
+        public static bool IsOfType<T, S>(this ILayoutContainer container)
+        {
+            return container is T || container is S;
+        }
+
+        public static AnchorSide GetSide(this ILayoutElement element)
+        {
+            var parentContainer = element.Parent as ILayoutOrientableGroup;
+            if (parentContainer != null)
+            {
+                if (!parentContainer.ContainsChildOfType<LayoutDocumentPaneGroup, LayoutDocumentPane>())
+                    return GetSide(parentContainer);
+
+                foreach (var childElement in parentContainer.Children)
+                {
+                    if (childElement == element ||
+                        childElement.Descendents().Contains(element))
+                        return parentContainer.Orientation == System.Windows.Controls.Orientation.Horizontal ?
+                            AnchorSide.Left : AnchorSide.Top;
+
+                    var childElementAsContainer = childElement as ILayoutContainer;
+                    if (childElementAsContainer != null &&
+                        (childElementAsContainer.IsOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>() ||
+                        childElementAsContainer.ContainsChildOfType<LayoutDocumentPane, LayoutDocumentPaneGroup>()))
+                    {
+                        return parentContainer.Orientation == System.Windows.Controls.Orientation.Horizontal ?
+                           AnchorSide.Right : AnchorSide.Bottom;
+                    }
+                }
+            }
+
+            Debug.Fail("Unable to find the side for an element, possible layout problem!");
+            return AnchorSide.Right;
+        }
+
+
+        internal static void KeepInsideNearestMonitor(this ILayoutElementForFloatingWindow paneInsideFloatingWindow)
+        {
+            Win32Helper.RECT r = new Win32Helper.RECT();
+            r.Left = (int)paneInsideFloatingWindow.FloatingLeft;
+            r.Top = (int)paneInsideFloatingWindow.FloatingTop;
+            r.Bottom = r.Top + (int)paneInsideFloatingWindow.FloatingHeight;
+            r.Right = r.Left + (int)paneInsideFloatingWindow.FloatingWidth;
+
+            uint MONITOR_DEFAULTTONEAREST = 0x00000002;
+            uint MONITOR_DEFAULTTONULL = 0x00000000;
+
+            System.IntPtr monitor = Win32Helper.MonitorFromRect(ref r, MONITOR_DEFAULTTONULL);
+            if (monitor == System.IntPtr.Zero)
+            {
+                System.IntPtr nearestmonitor = Win32Helper.MonitorFromRect(ref r, MONITOR_DEFAULTTONEAREST);
+                if (nearestmonitor != System.IntPtr.Zero)
+                {
+                    Win32Helper.MonitorInfo monitorInfo = new Win32Helper.MonitorInfo();
+                    monitorInfo.Size = Marshal.SizeOf(monitorInfo);
+                    Win32Helper.GetMonitorInfo(nearestmonitor, monitorInfo);
+
+                    if (paneInsideFloatingWindow.FloatingLeft < monitorInfo.Work.Left)
+                    {
+                        paneInsideFloatingWindow.FloatingLeft = monitorInfo.Work.Left + 10;
+                    }
+
+                    if (paneInsideFloatingWindow.FloatingLeft + paneInsideFloatingWindow.FloatingWidth > monitorInfo.Work.Right)
+                    {
+                        paneInsideFloatingWindow.FloatingLeft = monitorInfo.Work.Right - (paneInsideFloatingWindow.FloatingWidth + 10);
+                    }
+
+                    if (paneInsideFloatingWindow.FloatingTop < monitorInfo.Work.Top)
+                    {
+                        paneInsideFloatingWindow.FloatingTop = monitorInfo.Work.Top + 10;
+                    }
+
+                    if (paneInsideFloatingWindow.FloatingTop + paneInsideFloatingWindow.FloatingHeight > monitorInfo.Work.Bottom)
+                    {
+                        paneInsideFloatingWindow.FloatingTop = monitorInfo.Work.Bottom - (paneInsideFloatingWindow.FloatingHeight + 10);
+                    }
+                }
+            }
+
+        }
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
new file mode 100644
index 000000000..feacc288a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
@@ -0,0 +1,27 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutAnchorablePane : ILayoutPanelElement, ILayoutPane
+    {
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
new file mode 100644
index 000000000..78d765d8a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
@@ -0,0 +1,31 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutContainer : ILayoutElement
+    {
+        IEnumerable<ILayoutElement> Children { get; }
+        void RemoveChild(ILayoutElement element);
+        void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement);
+        int ChildrenCount { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
new file mode 100644
index 000000000..ea01b9d5b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
@@ -0,0 +1,32 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutContentSelector
+    {
+        int SelectedContentIndex { get; set; }
+
+        int IndexOf(LayoutContent content);
+
+        LayoutContent SelectedContent { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
new file mode 100644
index 000000000..b65551222
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
@@ -0,0 +1,28 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutControl
+    {
+        ILayoutElement Model { get;  }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
new file mode 100644
index 000000000..239f93619
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
@@ -0,0 +1,27 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutDocumentPane : ILayoutPanelElement, ILayoutPane
+    {
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
new file mode 100644
index 000000000..605144d09
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutElement : INotifyPropertyChanged, INotifyPropertyChanging
+    {
+        ILayoutContainer Parent { get; }
+        ILayoutRoot Root { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
new file mode 100644
index 000000000..c65178b74
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
@@ -0,0 +1,28 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutElementWithVisibility
+    {
+        void ComputeVisibility();
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
new file mode 100644
index 000000000..eab626a88
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
@@ -0,0 +1,32 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutGroup : ILayoutContainer
+    {
+        int IndexOfChild(ILayoutElement element);
+        void InsertChildAt(int index, ILayoutElement element);
+        void RemoveChildAt(int index);
+        void ReplaceChildAt(int index, ILayoutElement element);
+        event EventHandler ChildrenCollectionChanged;
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
new file mode 100644
index 000000000..88e36611f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
@@ -0,0 +1,29 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutOrientableGroup : ILayoutGroup
+    {
+        Orientation Orientation { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
new file mode 100644
index 000000000..a65de4ba4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutPane : ILayoutContainer, ILayoutElementWithVisibility
+    {
+        void MoveChild(int oldIndex, int newIndex);
+
+        void RemoveChildAt(int childIndex);
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
new file mode 100644
index 000000000..eba7e08e7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
@@ -0,0 +1,28 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    interface ILayoutPaneSerializable
+    {
+        string Id { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
new file mode 100644
index 000000000..7da961afb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
@@ -0,0 +1,29 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutPanelElement : ILayoutElement
+    {
+        bool IsVisible { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
new file mode 100644
index 000000000..95b1e5db7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
@@ -0,0 +1,62 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    internal interface ILayoutPositionableElement : ILayoutElement, ILayoutElementForFloatingWindow
+    {
+        GridLength DockWidth
+        {
+            get;
+            set;
+        }
+
+        GridLength DockHeight
+        {
+            get;
+            set;
+        }
+
+        double DockMinWidth { get; set; }
+        double DockMinHeight { get; set; }
+
+
+
+        bool IsVisible { get; }
+    }
+
+
+    internal interface ILayoutPositionableElementWithActualSize
+    {
+        double ActualWidth { get; set; }
+        double ActualHeight { get; set; }
+    }
+
+    internal interface ILayoutElementForFloatingWindow
+    {
+        double FloatingWidth { get; set; }
+        double FloatingHeight { get; set; }
+        double FloatingLeft { get; set; }
+        double FloatingTop { get; set; }
+        bool IsMaximized { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
new file mode 100644
index 000000000..76a562126
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    interface ILayoutPreviousContainer
+    {
+        ILayoutContainer PreviousContainer { get; set; }
+
+        string PreviousContainerId { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
new file mode 100644
index 000000000..0eeb48b7b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutRoot
+    {
+        DockingManager Manager { get; }
+
+        LayoutPanel RootPanel { get; }
+
+        LayoutAnchorSide TopSide { get; }
+        LayoutAnchorSide LeftSide { get; }
+        LayoutAnchorSide RightSide { get; }
+        LayoutAnchorSide BottomSide { get; }
+
+        LayoutContent ActiveContent { get; set; }
+
+        void CollectGarbage();
+
+        ObservableCollection<LayoutFloatingWindow> FloatingWindows { get; }
+        ObservableCollection<LayoutAnchorable> Hidden { get; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
new file mode 100644
index 000000000..409fe5094
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
@@ -0,0 +1,45 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public interface ILayoutUpdateStrategy
+    {
+        bool BeforeInsertAnchorable(
+            LayoutRoot layout,
+            LayoutAnchorable anchorableToShow,
+            ILayoutContainer destinationContainer);
+
+        void AfterInsertAnchorable(
+            LayoutRoot layout,
+            LayoutAnchorable anchorableShown);
+
+
+        bool BeforeInsertDocument(
+            LayoutRoot layout,
+            LayoutDocument anchorableToShow,
+            ILayoutContainer destinationContainer);
+
+        void AfterInsertDocument(
+            LayoutRoot layout,
+            LayoutDocument anchorableShown);
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
new file mode 100644
index 000000000..6af4f25b7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
@@ -0,0 +1,111 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows.Markup;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutAnchorGroup : LayoutGroup<LayoutAnchorable>, ILayoutPreviousContainer, ILayoutPaneSerializable
+    {
+        public LayoutAnchorGroup()
+        {
+        }
+
+        protected override bool GetVisibility()
+        {
+            return Children.Count > 0;
+        }
+
+
+        #region PreviousContainer
+
+        [field:NonSerialized]
+        private ILayoutContainer _previousContainer = null;
+        [XmlIgnore]
+        ILayoutContainer ILayoutPreviousContainer.PreviousContainer
+        {
+            get { return _previousContainer; }
+            set
+            {
+                if (_previousContainer != value)
+                {
+                    _previousContainer = value;
+                    RaisePropertyChanged("PreviousContainer");
+                    var paneSerializable = _previousContainer as ILayoutPaneSerializable;
+                    if (paneSerializable != null &&
+                        paneSerializable.Id == null)
+                        paneSerializable.Id = Guid.NewGuid().ToString();
+                }
+            }
+        }
+
+        #endregion
+
+        string _id;
+        string ILayoutPaneSerializable.Id
+        {
+            get
+            {
+                return _id;
+            }
+            set
+            {
+                _id = value;
+            }
+        }
+
+        string ILayoutPreviousContainer.PreviousContainerId
+        {
+            get;
+            set;
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (_id != null)
+                writer.WriteAttributeString("Id", _id);
+            if (_previousContainer != null)
+            {
+                var paneSerializable = _previousContainer as ILayoutPaneSerializable;
+                if (paneSerializable != null)
+                {
+                    writer.WriteAttributeString("PreviousContainerId", paneSerializable.Id);
+                }
+            }
+
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Id"))
+                _id = reader.Value;
+            if (reader.MoveToAttribute("PreviousContainerId"))
+                ((ILayoutPreviousContainer)this).PreviousContainerId = reader.Value;
+
+
+            base.ReadXml(reader);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
new file mode 100644
index 000000000..60908226d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
@@ -0,0 +1,83 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows.Markup;
+using Xceed.Wpf.AvalonDock.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutAnchorSide : LayoutGroup<LayoutAnchorGroup>
+    {
+        public LayoutAnchorSide()
+        {
+        }
+
+        protected override bool GetVisibility()
+        {
+            return Children.Count > 0;
+        }
+
+
+        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+ 	        base.OnParentChanged(oldValue, newValue);
+
+            UpdateSide();
+        }
+
+        private void UpdateSide()
+        {
+            if (Root.LeftSide == this)
+                Side = AnchorSide.Left;
+            else if (Root.TopSide == this)
+                Side = AnchorSide.Top;
+            else if (Root.RightSide == this)
+                Side = AnchorSide.Right;
+            else if (Root.BottomSide == this)
+                Side = AnchorSide.Bottom;
+        }
+
+
+        #region Side
+
+        private AnchorSide _side;
+        public AnchorSide Side
+        {
+            get { return _side; }
+            private set
+            {
+                if (_side != value)
+                {
+                    RaisePropertyChanging("Side");
+                    _side = value;
+                    RaisePropertyChanged("Side");
+                }
+            }
+        }
+
+        #endregion
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
new file mode 100644
index 000000000..0d8919958
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
@@ -0,0 +1,635 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Xml.Serialization;
+using System.Windows.Controls;
+using System.Globalization;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public class LayoutAnchorable : LayoutContent
+    {
+        #region IsVisible
+        [XmlIgnore]
+        public bool IsVisible
+        {
+            get
+            {
+                return Parent != null && !(Parent is LayoutRoot);
+            }
+            set
+            {
+                if (value)
+                {
+                    Show();
+                }
+                else
+                {
+                    Hide();
+                }
+            }
+        }
+
+        public event EventHandler IsVisibleChanged;
+
+        void NotifyIsVisibleChanged()
+        {
+            if (IsVisibleChanged != null)
+                IsVisibleChanged(this, EventArgs.Empty);
+        }
+
+        [XmlIgnore]
+        public bool IsHidden
+        {
+            get
+            {
+                return (Parent is LayoutRoot);
+            }
+        }
+
+        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+            UpdateParentVisibility();
+            RaisePropertyChanged("IsVisible");
+            NotifyIsVisibleChanged();
+            RaisePropertyChanged("IsHidden");
+            RaisePropertyChanged("IsAutoHidden");
+            base.OnParentChanged(oldValue, newValue);
+        }
+
+        void UpdateParentVisibility()
+        {
+            var parentPane = Parent as ILayoutElementWithVisibility;
+            if (parentPane != null)
+                parentPane.ComputeVisibility();
+        }
+
+        #endregion
+
+        #region AutoHideWidth
+
+        private double _autohideWidth = 0.0;
+        public double AutoHideWidth
+        {
+            get { return _autohideWidth; }
+            set
+            {
+                if (_autohideWidth != value)
+                {
+                    RaisePropertyChanging("AutoHideWidth");
+                    value = Math.Max(value, _autohideMinWidth);
+                    _autohideWidth = value;
+                    RaisePropertyChanged("AutoHideWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoHideMinWidth
+
+        private double _autohideMinWidth = 100.0;
+        public double AutoHideMinWidth
+        {
+            get { return _autohideMinWidth; }
+            set
+            {
+                if (_autohideMinWidth != value)
+                {
+                    RaisePropertyChanging("AutoHideMinWidth");
+                    if (value < 0)
+                        throw new ArgumentException("value");
+                    _autohideMinWidth = value;
+                    RaisePropertyChanged("AutoHideMinWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoHideHeight
+
+        private double _autohideHeight = 0.0;
+        public double AutoHideHeight
+        {
+            get { return _autohideHeight; }
+            set
+            {
+                if (_autohideHeight != value)
+                {
+                    RaisePropertyChanging("AutoHideHeight");
+                    value = Math.Max(value, _autohideMinHeight);
+                    _autohideHeight = value;
+                    RaisePropertyChanged("AutoHideHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region AutoHideMinHeight
+
+        private double _autohideMinHeight = 100.0;
+        public double AutoHideMinHeight
+        {
+            get { return _autohideMinHeight; }
+            set
+            {
+                if (_autohideMinHeight != value)
+                {
+                    RaisePropertyChanging("AutoHideMinHeight");
+                    if (value < 0)
+                        throw new ArgumentException("value");
+                    _autohideMinHeight = value;
+                    RaisePropertyChanged("AutoHideMinHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Hide this contents
+        /// </summary>
+        /// <remarks>Add this content to <see cref="ILayoutRoot.Hidden"/> collection of parent root.</remarks>
+        public void Hide(bool cancelable = true)
+        {
+            if (!IsVisible)
+            {
+                IsSelected = true;
+                IsActive = true;
+                return;
+            }
+
+            if (cancelable)
+            {
+                CancelEventArgs args = new CancelEventArgs();
+                OnHiding(args);
+                if (args.Cancel)
+                    return;
+            }
+
+            RaisePropertyChanging("IsHidden");
+            RaisePropertyChanging("IsVisible");
+            //if (Parent is ILayoutPane)
+            {
+                var parentAsGroup = Parent as ILayoutGroup;
+                PreviousContainer = parentAsGroup;
+                PreviousContainerIndex = parentAsGroup.IndexOfChild(this);
+            }
+            Root.Hidden.Add(this);
+            RaisePropertyChanged("IsVisible");
+            RaisePropertyChanged("IsHidden");
+            NotifyIsVisibleChanged();
+        }
+
+        public event EventHandler<CancelEventArgs> Hiding;
+
+        protected virtual void OnHiding(CancelEventArgs args)
+        {
+            if (Hiding != null)
+                Hiding(this, args);
+        }
+
+
+        /// <summary>
+        /// Show the content
+        /// </summary>
+        /// <remarks>Try to show the content where it was previously hidden.</remarks>
+        public void Show()
+        {
+            if (IsVisible)
+                return;
+
+            if (!IsHidden)
+                throw new InvalidOperationException();
+
+            RaisePropertyChanging("IsHidden");
+            RaisePropertyChanging("IsVisible");
+
+            bool added = false;
+            var root = Root;
+            if (root != null && root.Manager != null)
+            {
+                if (root.Manager.LayoutUpdateStrategy != null)
+                    added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable(root as LayoutRoot, this, PreviousContainer);
+            }
+
+            if (!added && PreviousContainer != null)
+            {
+                var previousContainerAsLayoutGroup = PreviousContainer as ILayoutGroup;
+                if (PreviousContainerIndex < previousContainerAsLayoutGroup.ChildrenCount)
+                    previousContainerAsLayoutGroup.InsertChildAt(PreviousContainerIndex, this);
+                else
+                    previousContainerAsLayoutGroup.InsertChildAt(previousContainerAsLayoutGroup.ChildrenCount, this);
+                IsSelected = true;
+                IsActive = true;
+            }
+
+            if (root != null && root.Manager != null)
+            {
+                if (root.Manager.LayoutUpdateStrategy != null)
+                {
+                    root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable(root as LayoutRoot, this);
+                }
+            }
+
+            PreviousContainer = null;
+            PreviousContainerIndex = -1;
+
+            RaisePropertyChanged("IsVisible");
+            RaisePropertyChanged("IsHidden");
+            NotifyIsVisibleChanged();
+        }
+
+        protected override void InternalDock()
+        {
+            var root = Root as LayoutRoot;
+            LayoutAnchorablePane anchorablePane = null;
+
+            if (root.ActiveContent != null &&
+                root.ActiveContent != this)
+            {
+                //look for active content parent pane
+                anchorablePane = root.ActiveContent.Parent as LayoutAnchorablePane;
+            }
+
+            if (anchorablePane == null)
+            {
+                //look for a pane on the right side
+                anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().Where(pane => !pane.IsHostedInFloatingWindow && pane.GetSide() == AnchorSide.Right).FirstOrDefault();
+            }
+
+            if (anchorablePane == null)
+            {
+                //look for an available pane
+                anchorablePane = root.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault();
+            }
+
+
+            bool added = false;
+            if (root.Manager.LayoutUpdateStrategy != null)
+            {
+                added = root.Manager.LayoutUpdateStrategy.BeforeInsertAnchorable(root, this, anchorablePane);
+            }
+
+            if (!added)
+            {
+                if (anchorablePane == null)
+                {
+                    var mainLayoutPanel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                    if (root.RootPanel != null)
+                    {
+                        mainLayoutPanel.Children.Add(root.RootPanel);
+                    }
+
+                    root.RootPanel = mainLayoutPanel;
+                    anchorablePane = new LayoutAnchorablePane() { DockWidth = new GridLength(200.0, GridUnitType.Pixel) };
+                    mainLayoutPanel.Children.Add(anchorablePane);
+                }
+
+                anchorablePane.Children.Add(this);
+                added = true;
+            }
+
+            if (root.Manager.LayoutUpdateStrategy != null)
+            {
+                root.Manager.LayoutUpdateStrategy.AfterInsertAnchorable(root, this);
+            }
+
+            base.InternalDock();
+        }
+
+        /// <summary>
+        /// Add the anchorable to a DockingManager layout
+        /// </summary>
+        /// <param name="manager"></param>
+        /// <param name="strategy"></param>
+        public void AddToLayout(DockingManager manager, AnchorableShowStrategy strategy)
+        {
+            if (IsVisible ||
+                IsHidden)
+                throw new InvalidOperationException();
+
+
+            bool most = (strategy & AnchorableShowStrategy.Most) == AnchorableShowStrategy.Most;
+            bool left = (strategy & AnchorableShowStrategy.Left) == AnchorableShowStrategy.Left;
+            bool right = (strategy & AnchorableShowStrategy.Right) == AnchorableShowStrategy.Right;
+            bool top = (strategy & AnchorableShowStrategy.Top) == AnchorableShowStrategy.Top;
+            bool bottom = (strategy & AnchorableShowStrategy.Bottom) == AnchorableShowStrategy.Bottom;
+
+            if (!most)
+            { 
+                var side = AnchorSide.Left;
+                if (left)
+                    side = AnchorSide.Left;
+                if (right)
+                    side = AnchorSide.Right;
+                if (top)
+                    side = AnchorSide.Top;
+                if (bottom)
+                    side = AnchorSide.Bottom;
+
+                var anchorablePane = manager.Layout.Descendents().OfType<LayoutAnchorablePane>().FirstOrDefault(p => p.GetSide() == side);
+                if (anchorablePane != null)
+                    anchorablePane.Children.Add(this);
+                else
+                    most = true;
+            }
+
+
+            if (most)
+            {
+                if (manager.Layout.RootPanel == null)
+                    manager.Layout.RootPanel = new LayoutPanel() { Orientation = (left || right ? Orientation.Horizontal : Orientation.Vertical) };
+
+                if (left || right)
+                {
+                    if (manager.Layout.RootPanel.Orientation == Orientation.Vertical &&
+                        manager.Layout.RootPanel.ChildrenCount > 1)
+                    {
+                        manager.Layout.RootPanel = new LayoutPanel(manager.Layout.RootPanel);
+                    }
+
+                    manager.Layout.RootPanel.Orientation = Orientation.Horizontal;
+
+                    if (left)
+                        manager.Layout.RootPanel.Children.Insert(0, new LayoutAnchorablePane(this));
+                    else
+                        manager.Layout.RootPanel.Children.Add(new LayoutAnchorablePane(this));
+                }
+                else
+                {
+                    if (manager.Layout.RootPanel.Orientation == Orientation.Horizontal &&
+                        manager.Layout.RootPanel.ChildrenCount > 1)
+                    {
+                        manager.Layout.RootPanel = new LayoutPanel(manager.Layout.RootPanel);
+                    }
+
+                    manager.Layout.RootPanel.Orientation = Orientation.Vertical;
+
+                    if (top)
+                        manager.Layout.RootPanel.Children.Insert(0, new LayoutAnchorablePane(this));
+                    else
+                        manager.Layout.RootPanel.Children.Add(new LayoutAnchorablePane(this));
+                }
+
+            }
+        }
+
+
+        /// <summary>
+        /// Get a value indicating if the anchorable is anchored to a border in an autohide status
+        /// </summary>
+        public bool IsAutoHidden
+        {
+            get { return Parent != null && Parent is LayoutAnchorGroup; }
+        }
+
+
+        #region AutoHide
+        public void ToggleAutoHide()
+        {
+            #region Anchorable is already auto hidden
+            if (IsAutoHidden)
+            {
+                var parentGroup = Parent as LayoutAnchorGroup;
+                var parentSide = parentGroup.Parent as LayoutAnchorSide;
+                var previousContainer = ((ILayoutPreviousContainer)parentGroup).PreviousContainer as LayoutAnchorablePane;
+
+                if (previousContainer == null)
+                {
+                    AnchorSide side = (parentGroup.Parent as LayoutAnchorSide).Side;
+                    switch (side)
+                    {
+                        case AnchorSide.Right:
+                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal)
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                parentGroup.Root.RootPanel.Children.Add(previousContainer);
+                            }
+                            else
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                                root.RootPanel = panel;
+                                panel.Children.Add(oldRootPanel);
+                                panel.Children.Add(previousContainer);
+                            }
+                            break;
+                        case AnchorSide.Left:
+                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Horizontal)
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                parentGroup.Root.RootPanel.Children.Insert(0, previousContainer);
+                            }
+                            else
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Horizontal };
+                                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                                root.RootPanel = panel;
+                                panel.Children.Add(previousContainer);
+                                panel.Children.Add(oldRootPanel);
+                            }
+                            break;
+                        case AnchorSide.Top:
+                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                parentGroup.Root.RootPanel.Children.Insert(0, previousContainer);
+                            }
+                            else
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
+                                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                                root.RootPanel = panel;
+                                panel.Children.Add(previousContainer);
+                                panel.Children.Add(oldRootPanel);
+                            }
+                            break;
+                        case AnchorSide.Bottom:
+                            if (parentGroup.Root.RootPanel.Orientation == Orientation.Vertical)
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                parentGroup.Root.RootPanel.Children.Add(previousContainer);
+                            }
+                            else
+                            {
+                                previousContainer = new LayoutAnchorablePane();
+                                LayoutPanel panel = new LayoutPanel() { Orientation = Orientation.Vertical };
+                                LayoutRoot root = parentGroup.Root as LayoutRoot;
+                                LayoutPanel oldRootPanel = parentGroup.Root.RootPanel as LayoutPanel;
+                                root.RootPanel = panel;
+                                panel.Children.Add(oldRootPanel);
+                                panel.Children.Add(previousContainer);
+                            }
+                            break;
+                    }
+                }
+                else
+                { 
+                    //I'm about to remove parentGroup, redirect any content (ie hidden contents) that point to it
+                    //to previousContainer
+                    LayoutRoot root = parentGroup.Root as LayoutRoot;
+                    foreach (var cnt in root.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer == parentGroup))
+                    {
+                        cnt.PreviousContainer = previousContainer;
+                    }
+                }
+
+
+                foreach (var anchorableToToggle in parentGroup.Children.ToArray())
+                {
+                    previousContainer.Children.Add(anchorableToToggle);
+                }
+
+                parentSide.Children.Remove(parentGroup);
+            }
+            #endregion
+            #region Anchorable is docked
+            else if (Parent is LayoutAnchorablePane)
+            {
+                var root = Root;
+                var parentPane = Parent as LayoutAnchorablePane;
+
+                var newAnchorGroup = new LayoutAnchorGroup();
+
+                ((ILayoutPreviousContainer)newAnchorGroup).PreviousContainer = parentPane;
+
+                foreach (var anchorableToImport in parentPane.Children.ToArray())
+                    newAnchorGroup.Children.Add(anchorableToImport);
+
+                //detect anchor side for the pane
+                var anchorSide = parentPane.GetSide();
+
+                switch (anchorSide)
+                {
+                    case AnchorSide.Right:
+                        root.RightSide.Children.Add(newAnchorGroup);
+                        break;
+                    case AnchorSide.Left:
+                        root.LeftSide.Children.Add(newAnchorGroup);
+                        break;
+                    case AnchorSide.Top:
+                        root.TopSide.Children.Add(newAnchorGroup);
+                        break;
+                    case AnchorSide.Bottom:
+                        root.BottomSide.Children.Add(newAnchorGroup);
+                        break;
+                }
+            }
+            #endregion
+        }
+
+        #endregion
+
+        #region CanHide
+
+        private bool _canHide = true;
+        public bool CanHide
+        {
+            get { return _canHide; }
+            set
+            {
+                if (_canHide != value)
+                {
+                    _canHide = value;
+                    RaisePropertyChanged("CanHide");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanAutoHide
+
+        private bool _canAutoHide = true;
+        public bool CanAutoHide
+        {
+            get { return _canAutoHide; }
+            set
+            {
+                if (_canAutoHide != value)
+                {
+                    _canAutoHide = value;
+                    RaisePropertyChanged("CanAutoHide");
+                }
+            }
+        }
+
+        #endregion
+
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("CanHide"))
+                CanHide = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("CanAutoHide"))
+                CanAutoHide = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("AutoHideWidth"))
+                AutoHideWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("AutoHideHeight"))
+                AutoHideHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("AutoHideMinWidth"))
+                AutoHideMinWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("AutoHideMinHeight"))
+                AutoHideMinHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+
+            base.ReadXml(reader);
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (!CanHide)
+                writer.WriteAttributeString("CanHide", CanHide.ToString());
+            if (!CanAutoHide)
+                writer.WriteAttributeString("CanAutoHide", CanAutoHide.ToString(CultureInfo.InvariantCulture));
+            if (AutoHideWidth > 0)
+                writer.WriteAttributeString("AutoHideWidth", AutoHideWidth.ToString(CultureInfo.InvariantCulture));
+            if (AutoHideHeight > 0)
+                writer.WriteAttributeString("AutoHideHeight", AutoHideHeight.ToString(CultureInfo.InvariantCulture));
+            if (AutoHideMinWidth != 25.0)
+                writer.WriteAttributeString("AutoHideMinWidth", AutoHideMinWidth.ToString(CultureInfo.InvariantCulture));
+            if (AutoHideMinHeight != 25.0)
+                writer.WriteAttributeString("AutoHideMinHeight", AutoHideMinHeight.ToString(CultureInfo.InvariantCulture));
+
+
+            base.WriteXml(writer);
+        }
+
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "Anchorable()" );
+        }
+#endif
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
new file mode 100644
index 000000000..12500be70
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
@@ -0,0 +1,181 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Markup;
+using System.Diagnostics;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    [ContentProperty("RootPanel")]
+    public class LayoutAnchorableFloatingWindow : LayoutFloatingWindow, ILayoutElementWithVisibility
+    {
+        public LayoutAnchorableFloatingWindow()
+        { 
+
+        }
+
+        #region RootPanel
+
+        private LayoutAnchorablePaneGroup _rootPanel = null;
+        public LayoutAnchorablePaneGroup RootPanel
+        {
+            get { return _rootPanel; }
+            set
+            {
+                if (_rootPanel != value)
+                {
+                    RaisePropertyChanging("RootPanel");
+
+                    if (_rootPanel != null)
+                        _rootPanel.ChildrenTreeChanged -= new EventHandler<ChildrenTreeChangedEventArgs>(_rootPanel_ChildrenTreeChanged);
+
+                    _rootPanel = value;
+                    if (_rootPanel != null)
+                        _rootPanel.Parent = this;
+
+                    if (_rootPanel != null)
+                        _rootPanel.ChildrenTreeChanged += new EventHandler<ChildrenTreeChangedEventArgs>(_rootPanel_ChildrenTreeChanged);
+
+                    RaisePropertyChanged("RootPanel");
+                    RaisePropertyChanged("IsSinglePane");
+                    RaisePropertyChanged("SinglePane");
+                    RaisePropertyChanged("Children");
+                    RaisePropertyChanged("ChildrenCount");
+                    ((ILayoutElementWithVisibility)this).ComputeVisibility();
+                }
+            }
+        }
+
+        void _rootPanel_ChildrenTreeChanged(object sender, ChildrenTreeChangedEventArgs e)
+        {
+            RaisePropertyChanged("IsSinglePane");
+            RaisePropertyChanged("SinglePane");
+
+        }
+
+        public bool IsSinglePane
+        {
+            get
+            {
+                return RootPanel != null && RootPanel.Descendents().OfType<ILayoutAnchorablePane>().Where(p => p.IsVisible).Count() == 1;
+            }
+        }
+
+        public ILayoutAnchorablePane SinglePane
+        {
+            get
+            {
+                if (!IsSinglePane)
+                    return null;
+
+                var singlePane = RootPanel.Descendents().OfType<LayoutAnchorablePane>().Single(p => p.IsVisible);
+                singlePane.UpdateIsDirectlyHostedInFloatingWindow();
+                return singlePane;
+            }
+        }
+
+        #endregion
+
+        public override IEnumerable<ILayoutElement> Children
+        {
+            get 
+            {
+                if (ChildrenCount == 1)    
+                    yield return RootPanel;
+
+                yield break;
+            }
+        }
+
+        public override void RemoveChild(ILayoutElement element)
+        {
+            Debug.Assert(element == RootPanel && element != null);
+            RootPanel = null;
+        }
+
+        public override void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
+        {
+            Debug.Assert(oldElement == RootPanel && oldElement != null);
+            RootPanel = newElement as LayoutAnchorablePaneGroup;
+        }
+
+        public override int ChildrenCount
+        {
+            get 
+            {
+                if (RootPanel == null)
+                    return 0;
+                return 1; 
+            }
+        }
+
+        #region IsVisible
+        [NonSerialized]
+        private bool _isVisible = true;
+
+        [XmlIgnore]
+        public bool IsVisible
+        {
+            get { return _isVisible; }
+            private set
+            {
+                if (_isVisible != value)
+                {
+                    RaisePropertyChanging("IsVisible");
+                    _isVisible = value;
+                    RaisePropertyChanged("IsVisible");
+                    if (IsVisibleChanged != null)
+                        IsVisibleChanged(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        public event EventHandler IsVisibleChanged;
+
+        #endregion
+
+
+        void ILayoutElementWithVisibility.ComputeVisibility()
+        {
+            if (RootPanel != null)
+                IsVisible = RootPanel.IsVisible;
+            else
+                IsVisible = false;
+
+        }
+
+        public override bool IsValid
+        {
+            get { return RootPanel != null; }
+        }
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "FloatingAnchorableWindow()" );
+
+          RootPanel.ConsoleDump(tab + 1);
+        }
+#endif        
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
new file mode 100644
index 000000000..0a277bbf1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
@@ -0,0 +1,267 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows.Markup;
+using System.ComponentModel;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutAnchorablePane : LayoutPositionableGroup<LayoutAnchorable>, ILayoutAnchorablePane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
+    {
+        public LayoutAnchorablePane()
+        {
+        }
+
+        public LayoutAnchorablePane(LayoutAnchorable anchorable)
+        {
+            Children.Add(anchorable);
+        }
+
+        protected override bool GetVisibility()
+        {
+            return Children.Count > 0 && Children.Any(c => c.IsVisible);
+        }
+
+        #region SelectedContentIndex
+
+        private int _selectedIndex = -1;
+        public int SelectedContentIndex
+        {
+            get { return _selectedIndex; }
+            set
+            {
+                if (value < 0 ||
+                    value >= Children.Count)
+                    value = -1;
+
+                if (_selectedIndex != value)
+                {
+                    RaisePropertyChanging("SelectedContentIndex");
+                    RaisePropertyChanging("SelectedContent");
+                    if (_selectedIndex >= 0 &&
+                        _selectedIndex < Children.Count)
+                        Children[_selectedIndex].IsSelected = false;
+
+                    _selectedIndex = value;
+
+                    if (_selectedIndex >= 0 &&
+                        _selectedIndex < Children.Count)
+                        Children[_selectedIndex].IsSelected = true;
+
+                    RaisePropertyChanged("SelectedContentIndex");
+                    RaisePropertyChanged("SelectedContent");
+                }
+            }
+        }
+
+        protected override void ChildMoved(int oldIndex, int newIndex)
+        {
+            if (_selectedIndex == oldIndex)
+            {
+                RaisePropertyChanging("SelectedContentIndex");
+                _selectedIndex = newIndex;
+                RaisePropertyChanged("SelectedContentIndex");
+            }
+
+
+            base.ChildMoved(oldIndex, newIndex);
+        }
+
+        public LayoutContent SelectedContent
+        {
+            get
+            { 
+                return _selectedIndex == -1 ? null : Children[_selectedIndex]; 
+            }
+        }
+        #endregion
+
+        protected override void OnChildrenCollectionChanged()
+        {
+            AutoFixSelectedContent();
+            for (int i = 0; i < Children.Count; i++)
+            {
+                if (Children[i].IsSelected)
+                {
+                    SelectedContentIndex = i;
+                    break;
+                }
+            }
+
+            RaisePropertyChanged("CanClose");
+            RaisePropertyChanged("CanHide");
+            RaisePropertyChanged("IsDirectlyHostedInFloatingWindow");
+            base.OnChildrenCollectionChanged();
+        }
+
+        [XmlIgnore]
+        bool _autoFixSelectedContent = true;
+        void AutoFixSelectedContent()
+        {
+            if (_autoFixSelectedContent)
+            {
+                if (SelectedContentIndex >= ChildrenCount)
+                    SelectedContentIndex = Children.Count - 1;
+
+                if (SelectedContentIndex == -1 && ChildrenCount > 0)
+                    SelectedContentIndex = 0;
+            }
+        }
+
+        public int IndexOf(LayoutContent content)
+        {
+            var anchorableChild = content as LayoutAnchorable;
+            if (anchorableChild == null)
+                return -1;
+
+            return Children.IndexOf(anchorableChild);
+        }
+
+
+        public bool IsDirectlyHostedInFloatingWindow
+        {
+            get
+            {
+                var parentFloatingWindow = this.FindParent<LayoutAnchorableFloatingWindow>();
+                if (parentFloatingWindow != null)
+                    return parentFloatingWindow.IsSinglePane;
+
+                return false;
+                //return Parent != null && Parent.ChildrenCount == 1 && Parent.Parent is LayoutFloatingWindow;
+            }
+        }
+
+        internal void UpdateIsDirectlyHostedInFloatingWindow()
+        {
+            RaisePropertyChanged("IsDirectlyHostedInFloatingWindow");
+        }
+
+        public bool IsHostedInFloatingWindow
+        {
+            get
+            {
+                return this.FindParent<LayoutFloatingWindow>() != null;
+            }
+        }
+
+        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+            var oldGroup = oldValue as ILayoutGroup;
+            if (oldGroup != null)
+                oldGroup.ChildrenCollectionChanged -= new EventHandler(OnParentChildrenCollectionChanged);
+
+            RaisePropertyChanged("IsDirectlyHostedInFloatingWindow");
+
+            var newGroup = newValue as ILayoutGroup;
+            if (newGroup != null)
+                newGroup.ChildrenCollectionChanged += new EventHandler(OnParentChildrenCollectionChanged);
+
+            base.OnParentChanged(oldValue, newValue);
+        }
+
+        void OnParentChildrenCollectionChanged(object sender, EventArgs e)
+        {
+            RaisePropertyChanged("IsDirectlyHostedInFloatingWindow");
+        }
+
+        string _id;
+
+        string ILayoutPaneSerializable.Id
+        {
+            get
+            {
+                return _id;
+            }
+            set
+            {
+                _id = value;
+            }
+        }
+
+        #region Name
+
+        private string _name = null;
+        public string Name
+        {
+            get { return _name; }
+            set
+            {
+                if (_name != value)
+                {
+                    _name = value;
+                    RaisePropertyChanged("Name");
+                }
+            }
+        }
+
+        #endregion
+
+
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (_id != null)
+                writer.WriteAttributeString("Id", _id);
+            if (_name != null)
+                writer.WriteAttributeString("Name", _name);
+
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Id"))
+                _id = reader.Value;
+            if (reader.MoveToAttribute("Name"))
+                _name = reader.Value;
+
+            _autoFixSelectedContent = false;
+            base.ReadXml(reader);
+            _autoFixSelectedContent = true;
+            AutoFixSelectedContent();
+        }
+
+
+        public bool CanHide
+        {
+            get { return Children.All(a => a.CanHide); }
+        }
+
+        public bool CanClose
+        {
+            get { return Children.All(a => a.CanClose);}
+        }
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "AnchorablePane()" );
+
+          foreach (LayoutElement child in Children)
+              child.ConsoleDump(tab + 1);
+        }
+#endif
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
new file mode 100644
index 000000000..fb4253d87
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
@@ -0,0 +1,129 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutAnchorablePaneGroup : LayoutPositionableGroup<ILayoutAnchorablePane>, ILayoutAnchorablePane, ILayoutOrientableGroup
+    {
+        public LayoutAnchorablePaneGroup()
+        {
+        }
+
+        public LayoutAnchorablePaneGroup(LayoutAnchorablePane firstChild)
+        {
+            Children.Add(firstChild);
+        }
+
+        #region Orientation
+
+        private Orientation _orientation;
+        public Orientation Orientation
+        {
+            get { return _orientation; }
+            set
+            {
+                if (_orientation != value)
+                {
+                    RaisePropertyChanging("Orientation");
+                    _orientation = value;
+                    RaisePropertyChanged("Orientation");
+                }
+            }
+        }
+
+        #endregion
+
+        protected override bool GetVisibility()
+        {
+            return Children.Count > 0 && Children.Any(c => c.IsVisible);
+        }
+
+        protected override void OnIsVisibleChanged()
+        {
+            UpdateParentVisibility();
+            base.OnIsVisibleChanged();
+        }
+
+        void UpdateParentVisibility()
+        {
+            var parentPane = Parent as ILayoutElementWithVisibility;
+            if (parentPane != null)
+                parentPane.ComputeVisibility();
+        }
+
+        protected override void OnDockWidthChanged()
+        {
+            if (DockWidth.IsAbsolute && ChildrenCount == 1)
+                ((ILayoutPositionableElement)Children[0]).DockWidth = DockWidth;
+
+            base.OnDockWidthChanged();
+        }
+
+        protected override void OnDockHeightChanged()
+        {
+            if (DockHeight.IsAbsolute && ChildrenCount == 1)
+                ((ILayoutPositionableElement)Children[0]).DockHeight = DockHeight;
+            base.OnDockHeightChanged();
+        }
+
+        protected override void OnChildrenCollectionChanged()
+        {
+            if (DockWidth.IsAbsolute && ChildrenCount == 1)
+                ((ILayoutPositionableElement)Children[0]).DockWidth = DockWidth;
+            if (DockHeight.IsAbsolute && ChildrenCount == 1)
+                ((ILayoutPositionableElement)Children[0]).DockHeight = DockHeight;
+            base.OnChildrenCollectionChanged();
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            writer.WriteAttributeString("Orientation", Orientation.ToString());
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Orientation"))
+                Orientation = (Orientation)Enum.Parse(typeof(Orientation), reader.Value, true);
+            base.ReadXml(reader);
+        }
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( string.Format( "AnchorablePaneGroup({0})", Orientation ) );
+
+          foreach (LayoutElement child in Children)
+              child.ConsoleDump(tab + 1);
+        }
+#endif
+
+
+    }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
new file mode 100644
index 000000000..aae6fc1b3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
@@ -0,0 +1,768 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Markup;
+using System.Xml.Serialization;
+using System.Windows;
+using System.Globalization;
+using System.Windows.Media;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Content")]
+    [Serializable]
+    public abstract class LayoutContent : LayoutElement, IXmlSerializable, ILayoutElementForFloatingWindow, IComparable<LayoutContent>, ILayoutPreviousContainer
+    {
+        internal LayoutContent()
+        { }
+
+        #region Title
+
+        private string _title = null;
+        public string Title
+        {
+            get { return _title; }
+            set
+            {
+                if (_title != value)
+                {
+                    RaisePropertyChanging("Title");
+                    _title = value;
+                    RaisePropertyChanged("Title");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Content
+        [NonSerialized]
+        private object _content = null;
+        [XmlIgnore]
+        public object Content
+        {
+            get { return _content; }
+            set
+            {
+                if (_content != value)
+                {
+                    RaisePropertyChanging("Content");
+                    _content = value;
+                    RaisePropertyChanged("Content");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ContentId
+
+        private string _contentId = null;
+        public string ContentId
+        {
+            get 
+            {
+                if (_contentId == null)
+                { 
+                    var contentAsControl = _content as FrameworkElement;
+                    if (contentAsControl != null && !string.IsNullOrWhiteSpace(contentAsControl.Name))
+                        return contentAsControl.Name;
+                }
+                return _contentId; 
+            }
+            set
+            {
+                if (_contentId != value)
+                {
+                    _contentId = value;
+                    RaisePropertyChanged("ContentId");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsSelected
+
+        private bool _isSelected = false;
+        public bool IsSelected
+        {
+            get { return _isSelected; }
+            set
+            {
+                if (_isSelected != value)
+                {
+                    bool oldValue = _isSelected;
+                    RaisePropertyChanging("IsSelected");
+                    _isSelected = value;
+                    var parentSelector = (Parent as ILayoutContentSelector);
+                    if (parentSelector != null)
+                        parentSelector.SelectedContentIndex = _isSelected ? parentSelector.IndexOf(this) : -1;
+                    OnIsSelectedChanged(oldValue, value);
+                    RaisePropertyChanged("IsSelected");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IsSelected property.
+        /// </summary>
+        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
+        {
+            if (IsSelectedChanged != null)
+                IsSelectedChanged(this, EventArgs.Empty);
+        }
+
+        public event EventHandler IsSelectedChanged;
+
+        #endregion
+
+        #region IsActive
+
+        [field: NonSerialized]
+        private bool _isActive = false;
+        [XmlIgnore]
+        public bool IsActive
+        {
+            get { return _isActive; }
+            set
+            {
+                if (_isActive != value)
+                {
+                    RaisePropertyChanging("IsActive");
+                    bool oldValue = _isActive;
+
+                    _isActive = value;
+
+                    var root = Root;
+                    if (root != null && _isActive)
+                        root.ActiveContent = this;
+
+                    if (_isActive)
+                        IsSelected = true;
+
+                    OnIsActiveChanged(oldValue, value);
+                    RaisePropertyChanged("IsActive");
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the IsActive property.
+        /// </summary>
+        protected virtual void OnIsActiveChanged(bool oldValue, bool newValue)
+        {
+            if (newValue)
+                LastActivationTimeStamp = DateTime.Now;
+
+            if (IsActiveChanged != null)
+                IsActiveChanged(this, EventArgs.Empty);
+        }
+
+        public event EventHandler IsActiveChanged;
+
+        #endregion
+
+        #region IsLastFocusedDocument
+
+        private bool _isLastFocusedDocument = false;
+        public bool IsLastFocusedDocument
+        {
+            get { return _isLastFocusedDocument; }
+            internal set
+            {
+                if (_isLastFocusedDocument != value)
+                {
+                    RaisePropertyChanging("IsLastFocusedDocument");
+                    _isLastFocusedDocument = value;
+                    RaisePropertyChanged("IsLastFocusedDocument");
+                }
+            }
+        }
+
+        #endregion
+
+        #region PreviousContainer
+
+        [field: NonSerialized]
+        private ILayoutContainer _previousContainer = null;
+
+        [XmlIgnore]
+        ILayoutContainer ILayoutPreviousContainer.PreviousContainer
+        {
+            get { return _previousContainer; }
+            set
+            {
+                if (_previousContainer != value)
+                {
+                    _previousContainer = value;
+                    RaisePropertyChanged("PreviousContainer");
+
+                    var paneSerializable = _previousContainer as ILayoutPaneSerializable;
+                    if (paneSerializable != null &&
+                        paneSerializable.Id == null)
+                        paneSerializable.Id = Guid.NewGuid().ToString();
+                }
+            }
+        }
+
+        protected ILayoutContainer PreviousContainer
+        {
+            get { return ((ILayoutPreviousContainer)this).PreviousContainer; }
+            set { ((ILayoutPreviousContainer)this).PreviousContainer = value; }
+        }
+
+        [XmlIgnore]
+        string ILayoutPreviousContainer.PreviousContainerId
+        {
+            get;
+            set;
+        }
+
+        protected string PreviousContainerId
+        {
+            get { return ((ILayoutPreviousContainer)this).PreviousContainerId; }
+            set { ((ILayoutPreviousContainer)this).PreviousContainerId = value; }
+        }
+
+        #endregion
+
+        #region PreviousContainerIndex
+        [field: NonSerialized]
+        private int _previousContainerIndex = -1;
+        [XmlIgnore]
+        public int PreviousContainerIndex
+        {
+            get { return _previousContainerIndex; }
+            set
+            {
+                if (_previousContainerIndex != value)
+                {
+                    _previousContainerIndex = value;
+                    RaisePropertyChanged("PreviousContainerIndex");
+                }
+            }
+        }
+
+        #endregion
+
+        #region LastActivationTimeStamp
+
+        private DateTime? _lastActivationTimeStamp = null;
+        public DateTime? LastActivationTimeStamp
+        {
+            get { return _lastActivationTimeStamp; }
+            set
+            {
+                if (_lastActivationTimeStamp != value)
+                {
+                    _lastActivationTimeStamp = value;
+                    RaisePropertyChanged("LastActivationTimeStamp");
+                }
+            }
+        }
+
+        #endregion
+
+        protected override void OnParentChanging(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+            var root = Root;
+
+            if (oldValue != null)
+                IsSelected = false;
+
+            //if (root != null && _isActive && newValue == null)
+            //    root.ActiveContent = null;
+
+            base.OnParentChanging(oldValue, newValue);
+        }
+
+        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+            if (IsSelected && Parent != null && Parent is ILayoutContentSelector)
+            {
+                var parentSelector = (Parent as ILayoutContentSelector);
+                parentSelector.SelectedContentIndex = parentSelector.IndexOf(this);
+            }
+
+            //var root = Root;
+            //if (root != null && _isActive)
+            //    root.ActiveContent = this;
+
+            base.OnParentChanged(oldValue, newValue);
+        }
+
+        /// <summary>
+        /// Test if the content can be closed
+        /// </summary>
+        /// <returns></returns>
+        internal bool TestCanClose()
+        {
+            CancelEventArgs args = new CancelEventArgs();
+
+            OnClosing(args);
+
+            if (args.Cancel)
+                return false;
+
+            return true;
+        }
+
+        /// <summary>
+        /// Close the content
+        /// </summary>
+        /// <remarks>Please note that usually the anchorable is only hidden (not closed). By default when user click the X button it only hides the content.</remarks>
+        public void Close()
+        {
+            var root = Root;
+            var parentAsContainer = Parent as ILayoutContainer;
+            parentAsContainer.RemoveChild(this);
+            if (root != null)
+                root.CollectGarbage();
+
+            OnClosed();
+        }
+
+        /// <summary>
+        /// Event fired when the content is closed (i.e. removed definitely from the layout)
+        /// </summary>
+        public event EventHandler Closed;
+
+        protected virtual void OnClosed()
+        {
+            if (Closed != null)
+                Closed(this, EventArgs.Empty);
+        }
+
+        /// <summary>
+        /// Event fired when the content is about to be closed (i.e. removed definitely from the layout)
+        /// </summary>
+        /// <remarks>Please note that LayoutAnchorable also can be hidden. Usually user hide anchorables when click the 'X' button. To completely close 
+        /// an anchorable the user should click the 'Close' menu item from the context menu. When an LayoutAnchorable is hidden its visibility changes to false and
+        /// IsHidden property is set to true.
+        /// Hanlde the Hiding event for the LayoutAnchorable to cancel the hide operation.</remarks>
+        public event EventHandler<CancelEventArgs> Closing;
+
+        protected virtual void OnClosing(CancelEventArgs args)
+        {
+            if (Closing != null)
+                Closing(this, args);
+        }
+
+        public System.Xml.Schema.XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        public virtual void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Title"))
+                Title = reader.Value;
+            //if (reader.MoveToAttribute("IconSource"))
+            //    IconSource = new Uri(reader.Value, UriKind.RelativeOrAbsolute);
+
+            if (reader.MoveToAttribute("IsSelected"))
+                IsSelected = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("ContentId"))
+                ContentId = reader.Value;
+            if (reader.MoveToAttribute("IsLastFocusedDocument"))
+                IsLastFocusedDocument = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("PreviousContainerId"))
+                PreviousContainerId = reader.Value;
+            if (reader.MoveToAttribute("PreviousContainerIndex"))
+                PreviousContainerIndex = int.Parse(reader.Value);
+
+            if (reader.MoveToAttribute("FloatingLeft"))
+                FloatingLeft = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingTop"))
+                FloatingTop = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingWidth"))
+                FloatingWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingHeight"))
+                FloatingHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("IsMaximized"))
+                IsMaximized = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("CanClose"))
+                CanClose = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("CanFloat"))
+                CanFloat = bool.Parse(reader.Value);
+            if (reader.MoveToAttribute("LastActivationTimeStamp"))
+                LastActivationTimeStamp = DateTime.Parse(reader.Value, CultureInfo.InvariantCulture);
+
+            reader.Read();
+        }
+
+        public virtual void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (!string.IsNullOrWhiteSpace(Title))
+                writer.WriteAttributeString("Title", Title);
+
+            //if (IconSource != null)
+            //    writer.WriteAttributeString("IconSource", IconSource.ToString());
+
+            if (IsSelected)
+                writer.WriteAttributeString("IsSelected", IsSelected.ToString());
+
+            if (IsLastFocusedDocument)
+                writer.WriteAttributeString("IsLastFocusedDocument", IsLastFocusedDocument.ToString());
+
+            if (!string.IsNullOrWhiteSpace(ContentId))
+                writer.WriteAttributeString("ContentId", ContentId);
+
+
+            if (ToolTip != null && ToolTip is string)
+                if (!string.IsNullOrWhiteSpace((string)ToolTip))
+                    writer.WriteAttributeString("ToolTip", (string)ToolTip);
+
+            if (FloatingLeft != 0.0)
+                writer.WriteAttributeString("FloatingLeft", FloatingLeft.ToString(CultureInfo.InvariantCulture));
+            if (FloatingTop != 0.0)
+                writer.WriteAttributeString("FloatingTop", FloatingTop.ToString(CultureInfo.InvariantCulture));
+            if (FloatingWidth != 0.0)
+                writer.WriteAttributeString("FloatingWidth", FloatingWidth.ToString(CultureInfo.InvariantCulture));
+            if (FloatingHeight != 0.0)
+                writer.WriteAttributeString("FloatingHeight", FloatingHeight.ToString(CultureInfo.InvariantCulture));
+
+            if (IsMaximized)
+                writer.WriteAttributeString("IsMaximized", IsMaximized.ToString());
+            if (!CanClose)
+                writer.WriteAttributeString("CanClose", CanClose.ToString());
+            if (!CanFloat)
+                writer.WriteAttributeString("CanFloat", CanFloat.ToString());
+
+            if (LastActivationTimeStamp != null)
+                writer.WriteAttributeString("LastActivationTimeStamp", LastActivationTimeStamp.Value.ToString(CultureInfo.InvariantCulture));
+
+            if (_previousContainer != null)
+            {
+                var paneSerializable = _previousContainer as ILayoutPaneSerializable;
+                if (paneSerializable != null)
+                {
+                    writer.WriteAttributeString("PreviousContainerId", paneSerializable.Id);
+                    writer.WriteAttributeString("PreviousContainerIndex", _previousContainerIndex.ToString());
+                }
+            }
+
+        }
+
+        #region FloatingWidth
+
+        private double _floatingWidth = 0.0;
+        public double FloatingWidth
+        {
+            get { return _floatingWidth; }
+            set
+            {
+                if (_floatingWidth != value)
+                {
+                    RaisePropertyChanging("FloatingWidth");
+                    _floatingWidth = value;
+                    RaisePropertyChanged("FloatingWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingHeight
+
+        private double _floatingHeight = 0.0;
+        public double FloatingHeight
+        {
+            get { return _floatingHeight; }
+            set
+            {
+                if (_floatingHeight != value)
+                {
+                    RaisePropertyChanging("FloatingHeight");
+                    _floatingHeight = value;
+                    RaisePropertyChanged("FloatingHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingLeft
+
+        private double _floatingLeft = 0.0;
+        public double FloatingLeft
+        {
+            get { return _floatingLeft; }
+            set
+            {
+                if (_floatingLeft != value)
+                {
+                    RaisePropertyChanging("FloatingLeft");
+                    _floatingLeft = value;
+                    RaisePropertyChanged("FloatingLeft");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingTop
+
+        private double _floatingTop = 0.0;
+        public double FloatingTop
+        {
+            get { return _floatingTop; }
+            set
+            {
+                if (_floatingTop != value)
+                {
+                    RaisePropertyChanging("FloatingTop");
+                    _floatingTop = value;
+                    RaisePropertyChanged("FloatingTop");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsMaximized
+
+        private bool _isMaximized = false;
+        public bool IsMaximized
+        {
+            get { return _isMaximized; }
+            set
+            {
+                if (_isMaximized != value)
+                {
+                    RaisePropertyChanging("IsMaximized");
+                    _isMaximized = value;
+                    RaisePropertyChanged("IsMaximized");
+                }
+            }
+        }
+
+        #endregion
+
+        #region ToolTip
+
+        private object _toolTip = null;
+        public object ToolTip
+        {
+            get { return _toolTip; }
+            set
+            {
+                if (_toolTip != value)
+                {
+                    _toolTip = value;
+                    RaisePropertyChanged("ToolTip");
+                }
+            }
+        }
+
+        #endregion
+
+        public bool IsFloating
+        {
+            get { return this.FindParent<LayoutFloatingWindow>() != null; }
+        }
+
+        #region IconSource
+
+        private ImageSource _iconSource = null;
+        public ImageSource IconSource
+        {
+            get { return _iconSource; }
+            set
+            {
+                if (_iconSource != value)
+                {
+                    _iconSource = value;
+                    RaisePropertyChanged("IconSource");
+                }
+            }
+        }
+
+        #endregion
+
+        public int CompareTo(LayoutContent other)
+        {
+            var contentAsComparable = Content as IComparable;
+            if (contentAsComparable != null)
+            {
+                return contentAsComparable.CompareTo(other.Content);
+            }
+
+            return string.Compare(Title, other.Title);
+        }
+
+        /// <summary>
+        /// Float the content in a popup window
+        /// </summary>
+        public void Float()
+        {
+            if (PreviousContainer != null &&
+                PreviousContainer.FindParent<LayoutFloatingWindow>() != null)
+            {
+
+                var currentContainer = Parent as ILayoutPane;
+                var currentContainerIndex = (currentContainer as ILayoutGroup).IndexOfChild(this);
+                var previousContainerAsLayoutGroup = PreviousContainer as ILayoutGroup;
+
+                if (PreviousContainerIndex < previousContainerAsLayoutGroup.ChildrenCount)
+                    previousContainerAsLayoutGroup.InsertChildAt(PreviousContainerIndex, this);
+                else
+                    previousContainerAsLayoutGroup.InsertChildAt(previousContainerAsLayoutGroup.ChildrenCount, this);
+
+                PreviousContainer = currentContainer;
+                PreviousContainerIndex = currentContainerIndex;
+
+                IsSelected = true;
+                IsActive = true;
+
+                Root.CollectGarbage();
+            }
+            else
+            {
+                Root.Manager.StartDraggingFloatingWindowForContent(this, false);
+
+                IsSelected = true;
+                IsActive = true;
+            }
+
+        }
+
+        /// <summary>
+        /// Dock the content as document
+        /// </summary>
+        public void DockAsDocument()
+        {
+            var root = Root as LayoutRoot;
+            if (root == null)
+                throw new InvalidOperationException();
+            if (Parent is LayoutDocumentPane)
+                return;
+
+            if (PreviousContainer is LayoutDocumentPane)
+            {
+                Dock();
+                return;
+            }
+
+            LayoutDocumentPane newParentPane;
+            if (root.LastFocusedDocument != null)
+            {
+                newParentPane = root.LastFocusedDocument.Parent as LayoutDocumentPane;
+            }
+            else
+            {
+                newParentPane = root.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+            }
+
+            if (newParentPane != null)
+            {
+                newParentPane.Children.Add(this);
+                root.CollectGarbage();
+            }
+
+            IsSelected = true;
+            IsActive = true;
+        }
+
+        /// <summary>
+        /// Re-dock the content to its previous container
+        /// </summary>
+        public void Dock()
+        {
+            if (PreviousContainer != null)
+            {
+                var currentContainer = Parent as ILayoutContainer;
+                var currentContainerIndex = (currentContainer is ILayoutGroup) ? (currentContainer as ILayoutGroup).IndexOfChild(this) : -1;
+                var previousContainerAsLayoutGroup = PreviousContainer as ILayoutGroup;
+
+                if (PreviousContainerIndex < previousContainerAsLayoutGroup.ChildrenCount)
+                    previousContainerAsLayoutGroup.InsertChildAt(PreviousContainerIndex, this);
+                else
+                    previousContainerAsLayoutGroup.InsertChildAt(previousContainerAsLayoutGroup.ChildrenCount, this);
+
+                if (currentContainerIndex > -1)
+                {
+                    PreviousContainer = currentContainer;
+                    PreviousContainerIndex = currentContainerIndex;
+                }
+                else
+                {
+                    PreviousContainer = null;
+                    PreviousContainerIndex = 0;
+                }
+
+                IsSelected = true;
+                IsActive = true;
+            }
+            else
+            {
+                InternalDock();
+            }
+
+
+            Root.CollectGarbage();
+
+        }
+
+        protected virtual void InternalDock()
+        { 
+
+        }
+
+
+        #region CanClose
+
+        private bool _canClose = true;
+        public bool CanClose
+        {
+            get { return _canClose; }
+            set
+            {
+                if (_canClose != value)
+                {
+                    _canClose = value;
+                    RaisePropertyChanged("CanClose");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CanFloat
+
+        private bool _canFloat = true;
+        public bool CanFloat
+        {
+            get { return _canFloat; }
+            set
+            {
+                if (_canFloat != value)
+                {
+                    _canFloat = value;
+                    RaisePropertyChanged("CanFloat");
+                }
+            }
+        }
+
+        #endregion
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
new file mode 100644
index 000000000..b47c8386d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
@@ -0,0 +1,118 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Globalization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public class LayoutDocument : LayoutContent
+    {
+        public bool IsVisible
+        {
+            get { return true; }
+        }
+
+        #region Description
+
+        private string _description = null;
+        public string Description
+        {
+            get { return _description; }
+            set
+            {
+                if (_description != value)
+                {
+                    _description = value;
+                    RaisePropertyChanged("Description");
+                }
+            }
+        }
+
+        #endregion
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            base.WriteXml(writer);
+
+            if (!string.IsNullOrWhiteSpace(Description))
+                writer.WriteAttributeString("Description", Description);
+
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Description"))
+                Description = reader.Value;
+
+            base.ReadXml(reader);
+        }
+
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "Document()" );
+        }
+#endif
+
+
+        protected override void InternalDock()
+        {
+            var root = Root as LayoutRoot;
+            LayoutDocumentPane documentPane = null;
+            if (root.LastFocusedDocument != null &&
+                root.LastFocusedDocument != this)
+            {
+                documentPane = root.LastFocusedDocument.Parent as LayoutDocumentPane;
+            }
+
+            if (documentPane == null)
+            {
+                documentPane = root.Descendents().OfType<LayoutDocumentPane>().FirstOrDefault();
+            }
+
+
+            bool added = false;
+            if (root.Manager.LayoutUpdateStrategy != null)
+            {
+                added = root.Manager.LayoutUpdateStrategy.BeforeInsertDocument(root, this, documentPane);
+            }
+
+            if (!added)
+            {
+                if (documentPane == null)
+                    throw new InvalidOperationException("Layout must contains at least one LayoutDocumentPane in order to host documents");
+
+                documentPane.Children.Add(this);
+                added = true;
+            }
+
+            if (root.Manager.LayoutUpdateStrategy != null)
+            {
+                root.Manager.LayoutUpdateStrategy.AfterInsertDocument(root, this);
+            }
+
+
+            base.InternalDock();
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
new file mode 100644
index 000000000..db08fadd9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
@@ -0,0 +1,107 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Markup;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("RootDocument")]
+    [Serializable]
+    public class LayoutDocumentFloatingWindow : LayoutFloatingWindow
+    {
+        public LayoutDocumentFloatingWindow()
+        {
+
+        }
+
+        #region RootDocument
+
+        private LayoutDocument _rootDocument = null;
+        public LayoutDocument RootDocument
+        {
+            get { return _rootDocument; }
+            set
+            {
+                if (_rootDocument != value)
+                {
+                    RaisePropertyChanging("RootDocument");
+                    _rootDocument = value;
+                    if (_rootDocument != null)
+                        _rootDocument.Parent = this;
+                    RaisePropertyChanged("RootDocument");
+
+                    if (RootDocumentChanged != null)
+                        RootDocumentChanged(this, EventArgs.Empty);
+                }
+            }
+        }
+
+
+        public event EventHandler RootDocumentChanged;
+
+        #endregion
+
+        public override IEnumerable<ILayoutElement> Children
+        {
+            get
+            {
+                if (RootDocument == null)
+                    yield break;
+
+                yield return RootDocument;
+            }
+        }
+
+        public override void RemoveChild(ILayoutElement element)
+        {
+            Debug.Assert(element == RootDocument && element != null);
+            RootDocument = null;
+        }
+
+        public override void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
+        {
+            Debug.Assert(oldElement == RootDocument && oldElement != null);
+            RootDocument = newElement as LayoutDocument;
+        }
+
+        public override int ChildrenCount
+        {
+            get { return RootDocument != null ? 1 : 0; }
+        }
+
+        public override bool IsValid
+        {
+            get { return RootDocument != null; }
+        }
+
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "FloatingDocumentWindow()" );
+
+          RootDocument.ConsoleDump(tab + 1);
+        }
+#endif
+    }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
new file mode 100644
index 000000000..3f4fa3300
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
@@ -0,0 +1,189 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows.Markup;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutDocumentPane : LayoutPositionableGroup<LayoutContent>, ILayoutDocumentPane, ILayoutPositionableElement, ILayoutContentSelector, ILayoutPaneSerializable
+    {
+        public LayoutDocumentPane()
+        {
+        }
+        public LayoutDocumentPane(LayoutContent firstChild)
+        {
+            Children.Add(firstChild);
+        }
+
+        protected override bool GetVisibility()
+        {
+            if (Parent is LayoutDocumentPaneGroup)
+                return ChildrenCount > 0;
+
+            return true;
+        }
+
+        #region SelectedContentIndex
+
+        private int _selectedIndex = -1;
+        public int SelectedContentIndex
+        {
+            get { return _selectedIndex; }
+            set
+            {
+                if (value < 0 ||
+                    value >= Children.Count)
+                    value = -1;
+
+                if (_selectedIndex != value)
+                {
+                    RaisePropertyChanging("SelectedContentIndex");
+                    RaisePropertyChanging("SelectedContent");
+                    if (_selectedIndex >= 0 &&
+                        _selectedIndex < Children.Count)
+                        Children[_selectedIndex].IsSelected = false;
+
+                    _selectedIndex = value;
+
+                    if (_selectedIndex >= 0 &&
+                        _selectedIndex < Children.Count)
+                        Children[_selectedIndex].IsSelected = true;
+
+                    RaisePropertyChanged("SelectedContentIndex");
+                    RaisePropertyChanged("SelectedContent");
+                }
+            }
+        }
+
+        protected override void ChildMoved(int oldIndex, int newIndex)
+        {
+            if (_selectedIndex == oldIndex)
+            {
+                RaisePropertyChanging("SelectedContentIndex");
+                _selectedIndex = newIndex;
+                RaisePropertyChanged("SelectedContentIndex");
+            }
+
+
+            base.ChildMoved(oldIndex, newIndex);
+        }
+
+        public LayoutContent SelectedContent
+        {
+            get { return _selectedIndex == -1 ? null : Children[_selectedIndex]; }
+        }
+        #endregion
+
+        protected override void OnChildrenCollectionChanged()
+        {
+            if (SelectedContentIndex >= ChildrenCount)
+                SelectedContentIndex = Children.Count - 1;
+            if (SelectedContentIndex == -1 && ChildrenCount > 0)
+            {
+                if (Root == null)//if I'm not yet connected just switch to first document
+                    SelectedContentIndex = 0;
+                else
+                {
+                    var childrenToSelect = Children.OrderByDescending(c => c.LastActivationTimeStamp.GetValueOrDefault()).First();
+                    SelectedContentIndex = Children.IndexOf(childrenToSelect);
+                    childrenToSelect.IsActive = true;
+                }
+            }
+
+            base.OnChildrenCollectionChanged();
+
+            RaisePropertyChanged("ChildrenSorted");
+        }
+
+        public int IndexOf(LayoutContent content)
+        {
+            return Children.IndexOf(content);
+        }
+
+        protected override void OnIsVisibleChanged()
+        {
+            UpdateParentVisibility();
+            base.OnIsVisibleChanged();
+        }
+
+        void UpdateParentVisibility()
+        {
+            var parentPane = Parent as ILayoutElementWithVisibility;
+            if (parentPane != null)
+                parentPane.ComputeVisibility();
+        }
+
+        public IEnumerable<LayoutContent> ChildrenSorted
+        {
+            get 
+            {
+                var listSorted = Children.ToList();
+                listSorted.Sort();
+                return listSorted;
+            }
+        }
+
+        string _id;
+        string ILayoutPaneSerializable.Id
+        {
+            get
+            {
+                return _id;
+            }
+            set
+            {
+                _id = value;
+            }
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (_id != null)
+                writer.WriteAttributeString("Id", _id);
+
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Id"))
+                _id = reader.Value;
+
+
+            base.ReadXml(reader);
+        }
+
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "DocumentPane()" );
+
+          foreach (LayoutElement child in Children)
+              child.ConsoleDump(tab + 1);
+        }
+#endif
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
new file mode 100644
index 000000000..c751e2d12
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
@@ -0,0 +1,89 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Markup;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutDocumentPaneGroup : LayoutPositionableGroup<ILayoutDocumentPane>, ILayoutDocumentPane, ILayoutOrientableGroup
+    {
+        public LayoutDocumentPaneGroup()
+        {
+        }
+
+        public LayoutDocumentPaneGroup(LayoutDocumentPane documentPane)
+        {
+            Children.Add(documentPane);
+        }
+
+        #region Orientation
+
+        private Orientation _orientation;
+        public Orientation Orientation
+        {
+            get { return _orientation; }
+            set
+            {
+                if (_orientation != value)
+                {
+                    RaisePropertyChanging("Orientation");
+                    _orientation = value;
+                    RaisePropertyChanged("Orientation");
+                }
+            }
+        }
+
+        #endregion
+
+        protected override bool GetVisibility()
+        {
+            return true;
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            writer.WriteAttributeString("Orientation", Orientation.ToString());
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Orientation"))
+                Orientation = (Orientation)Enum.Parse(typeof(Orientation), reader.Value, true);
+            base.ReadXml(reader);
+        }
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( string.Format( "DocumentPaneGroup({0})", Orientation ) );
+
+          foreach (LayoutElement child in Children)
+              child.ConsoleDump(tab + 1);
+        }
+#endif
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
new file mode 100644
index 000000000..8cda2f83e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
@@ -0,0 +1,138 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.ComponentModel;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public abstract class LayoutElement : DependencyObject, ILayoutElement
+    {
+        internal LayoutElement()
+        { }
+
+        #region Parent
+
+        [NonSerialized]
+        private ILayoutContainer _parent = null;
+        [NonSerialized]
+        private ILayoutRoot _root = null;
+        [XmlIgnore]
+        public ILayoutContainer Parent
+        {
+            get { return _parent; }
+            set
+            {
+                if (_parent != value)
+                {
+                    ILayoutContainer oldValue = _parent;
+                    ILayoutRoot oldRoot = _root;
+                    RaisePropertyChanging("Parent");
+                    OnParentChanging(oldValue, value);
+                    _parent = value;
+                    OnParentChanged(oldValue, value);
+
+                    _root = Root;
+                    if (oldRoot != _root)
+                        OnRootChanged(oldRoot, _root);
+
+                    RaisePropertyChanged("Parent");
+
+                    var root = Root as LayoutRoot;
+                    if (root != null)
+                        root.FireLayoutUpdated();
+                }
+            }
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle execute code before to the Parent property changes.
+        /// </summary>
+        protected virtual void OnParentChanging(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+        }
+
+        /// <summary>
+        /// Provides derived classes an opportunity to handle changes to the Parent property.
+        /// </summary>
+        protected virtual void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+
+        }
+
+
+        protected virtual void OnRootChanged(ILayoutRoot oldRoot, ILayoutRoot newRoot)
+        {
+            if (oldRoot != null)
+                ((LayoutRoot)oldRoot).OnLayoutElementRemoved(this);
+            if (newRoot != null)
+                ((LayoutRoot)newRoot).OnLayoutElementAdded(this);        
+        }
+
+
+        #endregion
+
+        [field: NonSerialized]
+        [field: XmlIgnore]
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        protected virtual void RaisePropertyChanged(string propertyName)
+        {
+            if (PropertyChanged != null)
+                PropertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
+        }
+
+        [field: NonSerialized]
+        [field: XmlIgnore]
+        public event PropertyChangingEventHandler PropertyChanging;
+
+        protected virtual void RaisePropertyChanging(string propertyName)
+        {
+            if (PropertyChanging != null)
+                PropertyChanging(this, new System.ComponentModel.PropertyChangingEventArgs(propertyName));
+        }
+
+        public ILayoutRoot Root
+        {
+            get
+            {
+                var parent = Parent;
+
+                while (parent != null && (!(parent is ILayoutRoot)))
+                {
+                    parent = parent.Parent;
+                }
+
+                return parent as ILayoutRoot;
+            }
+        }
+
+
+#if TRACE
+        public virtual void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new String( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( this.ToString() );
+        }
+#endif
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
new file mode 100644
index 000000000..44c336d82
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
@@ -0,0 +1,38 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    public class LayoutElementEventArgs : EventArgs
+    {
+        public LayoutElementEventArgs(LayoutElement element)
+        {
+            Element = element;
+        }
+
+
+        public LayoutElement Element
+        {
+            get;
+            private set;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
new file mode 100644
index 000000000..6f1748977
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Markup;
+using System.Windows;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    [XmlInclude(typeof(LayoutAnchorableFloatingWindow))]
+    [XmlInclude(typeof(LayoutDocumentFloatingWindow))]
+    public abstract class LayoutFloatingWindow : LayoutElement, ILayoutContainer
+    {
+        public LayoutFloatingWindow()
+        { 
+
+        }
+
+
+        public abstract IEnumerable<ILayoutElement> Children { get; }
+
+        public abstract void RemoveChild(ILayoutElement element);
+
+        public abstract void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement);
+
+        public abstract int ChildrenCount { get; }
+
+        public abstract bool IsValid { get; }
+
+
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
new file mode 100644
index 000000000..1ff571289
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
@@ -0,0 +1,244 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections.ObjectModel;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public abstract class LayoutGroup<T> : LayoutGroupBase, ILayoutContainer, ILayoutGroup, IXmlSerializable where T : class, ILayoutElement
+    {
+        internal LayoutGroup()
+        {
+            _children.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(_children_CollectionChanged);
+        }
+
+        void _children_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.OldItems != null)
+                {
+                    foreach (LayoutElement element in e.OldItems)
+                    {
+                        if (element.Parent == this)
+                            element.Parent = null;
+                    }
+                }
+            }
+
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.NewItems != null)
+                {
+                    foreach (LayoutElement element in e.NewItems)
+                    {
+                        if (element.Parent != this)
+                        {
+                            if (element.Parent != null)
+                                element.Parent.RemoveChild(element);
+                            element.Parent = this;
+                        }
+
+                    }
+                }
+            }
+
+            ComputeVisibility();
+            OnChildrenCollectionChanged();
+            NotifyChildrenTreeChanged(ChildrenTreeChange.DirectChildrenChanged);
+            RaisePropertyChanged("ChildrenCount");
+        }
+
+        ObservableCollection<T> _children = new ObservableCollection<T>();
+
+        public ObservableCollection<T> Children
+        {
+            get { return _children; }
+        }
+
+        IEnumerable<ILayoutElement> ILayoutContainer.Children
+        {
+            get { return _children.Cast<ILayoutElement>(); }
+        }
+
+
+        #region IsVisible
+
+        private bool _isVisible = true;
+        public bool IsVisible
+        {
+            get { return _isVisible; }
+            protected set
+            {
+                if (_isVisible != value)
+                {
+                    RaisePropertyChanging("IsVisible");
+                    _isVisible = value;
+                    OnIsVisibleChanged();
+                    RaisePropertyChanged("IsVisible");
+                }
+            }
+        }
+
+        protected virtual void OnIsVisibleChanged()
+        {
+            UpdateParentVisibility();
+        }
+
+        void UpdateParentVisibility()
+        {
+            var parentPane = Parent as ILayoutElementWithVisibility;
+            if (parentPane != null)
+                parentPane.ComputeVisibility();
+        }
+
+
+        public void ComputeVisibility()
+        {
+            IsVisible = GetVisibility();
+        }
+
+        protected abstract bool GetVisibility();
+
+        protected override void OnParentChanged(ILayoutContainer oldValue, ILayoutContainer newValue)
+        {
+            base.OnParentChanged(oldValue, newValue);
+
+            ComputeVisibility();
+        }
+
+        #endregion
+
+
+        public void MoveChild(int oldIndex, int newIndex)
+        {
+            if (oldIndex == newIndex)
+                return;
+            _children.Move(oldIndex, newIndex);
+            ChildMoved(oldIndex, newIndex);
+        }
+
+        protected virtual void ChildMoved(int oldIndex, int newIndex)
+        { 
+
+        }
+
+        public void RemoveChildAt(int childIndex)
+        {
+            _children.RemoveAt(childIndex);
+        }
+
+        public int IndexOfChild(ILayoutElement element)
+        {
+            return _children.Cast<ILayoutElement>().ToList().IndexOf(element);
+        }
+
+        public void InsertChildAt(int index, ILayoutElement element)
+        {
+            _children.Insert(index, (T)element);
+        }
+
+        public void RemoveChild(ILayoutElement element)
+        {
+            _children.Remove((T)element);
+        }
+
+        public void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
+        {
+            int index = _children.IndexOf((T)oldElement);
+            _children.Insert(index, (T)newElement);
+            _children.RemoveAt(index + 1);
+        }
+
+        public int ChildrenCount
+        {
+            get { return _children.Count; }
+        }
+
+        public void ReplaceChildAt(int index, ILayoutElement element)
+        {
+            _children[index] = (T)element;
+        }
+
+
+        public System.Xml.Schema.XmlSchema GetSchema()
+        {
+            return null;
+        }
+
+        public virtual void ReadXml(System.Xml.XmlReader reader)
+        {
+            reader.MoveToContent();
+            if (reader.IsEmptyElement)
+            {
+                reader.Read();
+                ComputeVisibility();
+                return;
+            }
+            string localName = reader.LocalName;
+            reader.Read();
+            while (true)
+            {
+                if (reader.LocalName == localName &&
+                    reader.NodeType == System.Xml.XmlNodeType.EndElement)
+                {
+                    break;
+                }
+
+                XmlSerializer serializer = null;
+                if (reader.LocalName == "LayoutAnchorablePaneGroup")
+                    serializer = new XmlSerializer(typeof(LayoutAnchorablePaneGroup));
+                else if (reader.LocalName == "LayoutAnchorablePane")
+                    serializer = new XmlSerializer(typeof(LayoutAnchorablePane));
+                else if (reader.LocalName == "LayoutAnchorable")
+                    serializer = new XmlSerializer(typeof(LayoutAnchorable));
+                else if (reader.LocalName == "LayoutDocumentPaneGroup")
+                    serializer = new XmlSerializer(typeof(LayoutDocumentPaneGroup));
+                else if (reader.LocalName == "LayoutDocumentPane")
+                    serializer = new XmlSerializer(typeof(LayoutDocumentPane));
+                else if (reader.LocalName == "LayoutDocument")
+                    serializer = new XmlSerializer(typeof(LayoutDocument));
+                else if (reader.LocalName == "LayoutAnchorGroup")
+                    serializer = new XmlSerializer(typeof(LayoutAnchorGroup));
+                else if (reader.LocalName == "LayoutPanel")
+                    serializer = new XmlSerializer(typeof(LayoutPanel));
+
+                Children.Add((T)serializer.Deserialize(reader));
+            }
+
+            reader.ReadEndElement();
+        }
+
+        public virtual void WriteXml(System.Xml.XmlWriter writer)
+        {
+            foreach (var child in Children)
+            {
+                var type = child.GetType();
+                XmlSerializer serializer = new XmlSerializer(type);
+                serializer.Serialize(writer, child);
+            }
+
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
new file mode 100644
index 000000000..9e7e93cee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
@@ -0,0 +1,58 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Serialization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public abstract class LayoutGroupBase : LayoutElement
+    {
+        [field: NonSerialized]
+        [field: XmlIgnore]
+        public event EventHandler ChildrenCollectionChanged;
+
+        protected virtual void OnChildrenCollectionChanged()
+        {
+            if (ChildrenCollectionChanged != null)
+                ChildrenCollectionChanged(this, EventArgs.Empty);
+        }
+
+        protected void NotifyChildrenTreeChanged(ChildrenTreeChange change)
+        {
+            OnChildrenTreeChanged(change);
+            var parentGroup = Parent as LayoutGroupBase;
+            if (parentGroup != null)
+                parentGroup.NotifyChildrenTreeChanged(ChildrenTreeChange.TreeChanged);
+        }
+
+        [field: NonSerialized]
+        [field: XmlIgnore]
+        public event EventHandler<ChildrenTreeChangedEventArgs> ChildrenTreeChanged;
+
+        protected virtual void OnChildrenTreeChanged(ChildrenTreeChange change)
+        {
+            if (ChildrenTreeChanged != null)
+                ChildrenTreeChanged(this, new ChildrenTreeChangedEventArgs(change));
+        }
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
new file mode 100644
index 000000000..6cde4784d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
@@ -0,0 +1,92 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Markup;
+using System.Collections.ObjectModel;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("Children")]
+    [Serializable]
+    public class LayoutPanel : LayoutPositionableGroup<ILayoutPanelElement>, ILayoutPanelElement, ILayoutOrientableGroup
+    {
+        public LayoutPanel()
+        {
+
+        }
+
+        public LayoutPanel(ILayoutPanelElement firstChild)
+        {
+            Children.Add(firstChild);
+        }
+
+
+        #region Orientation
+
+        private Orientation _orientation;
+        public Orientation Orientation
+        {
+            get { return _orientation; }
+            set
+            {
+                if (_orientation != value)
+                {
+                    RaisePropertyChanging("Orientation");
+                    _orientation = value;
+                    RaisePropertyChanged("Orientation");
+                }
+            }
+        }
+
+        #endregion
+
+
+        protected override bool GetVisibility()
+        {
+            return Children.Any(c => c.IsVisible);
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            writer.WriteAttributeString("Orientation", Orientation.ToString());
+            base.WriteXml(writer);
+        }
+
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("Orientation"))
+                Orientation = (Orientation)Enum.Parse(typeof(Orientation), reader.Value, true);
+            base.ReadXml(reader);
+        }
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( string.Format( "Panel({0})", Orientation ) );
+
+          foreach (LayoutElement child in Children)
+              child.ConsoleDump(tab + 1);
+        }
+#endif
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
new file mode 100644
index 000000000..ea7b201a7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
@@ -0,0 +1,296 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Globalization;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [Serializable]
+    public abstract class LayoutPositionableGroup<T> : LayoutGroup<T>, ILayoutPositionableElement, ILayoutPositionableElementWithActualSize where T : class, ILayoutElement
+    {
+        public LayoutPositionableGroup()
+        { }
+
+        GridLength _dockWidth = new GridLength(1.0, GridUnitType.Star);
+        public GridLength DockWidth
+        {
+            get
+            {
+                return _dockWidth;
+            }
+            set
+            {
+                if (DockWidth != value)
+                {
+                    RaisePropertyChanging("DockWidth");
+                    _dockWidth = value;
+                    RaisePropertyChanged("DockWidth");
+
+                    OnDockWidthChanged();
+                }
+            }
+        }
+
+
+        protected virtual void OnDockWidthChanged()
+        {
+
+        }
+
+        GridLength _dockHeight = new GridLength(1.0, GridUnitType.Star);
+        public GridLength DockHeight
+        {
+            get
+            {
+                return _dockHeight;
+            }
+            set
+            {
+                if (DockHeight != value)
+                {
+                    RaisePropertyChanging("DockHeight");
+                    _dockHeight = value;
+                    RaisePropertyChanged("DockHeight");
+
+                    OnDockHeightChanged();
+                }
+            }
+        }
+
+        protected virtual void OnDockHeightChanged()
+        { 
+
+        }
+
+
+        #region DockMinWidth
+
+        private double _dockMinWidth = 25.0;
+        public double DockMinWidth
+        {
+            get { return _dockMinWidth; }
+            set
+            {
+                if (_dockMinWidth != value)
+                {
+                    MathHelper.AssertIsPositiveOrZero(value);
+                    RaisePropertyChanging("DockMinWidth");
+                    _dockMinWidth = value;
+                    RaisePropertyChanged("DockMinWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region DockMinHeight
+
+        private double _dockMinHeight = 25.0;
+        public double DockMinHeight
+        {
+            get { return _dockMinHeight; }
+            set
+            {
+                if (_dockMinHeight != value)
+                {
+                    MathHelper.AssertIsPositiveOrZero(value);
+                    RaisePropertyChanging("DockMinHeight");
+                    _dockMinHeight = value;
+                    RaisePropertyChanged("DockMinHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingWidth
+
+        private double _floatingWidth = 0.0;
+        public double FloatingWidth
+        {
+            get { return _floatingWidth; }
+            set
+            {
+                if (_floatingWidth != value)
+                {
+                    RaisePropertyChanging("FloatingWidth");
+                    _floatingWidth = value;
+                    RaisePropertyChanged("FloatingWidth");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingHeight
+
+        private double _floatingHeight = 0.0;
+        public double FloatingHeight
+        {
+            get { return _floatingHeight; }
+            set
+            {
+                if (_floatingHeight != value)
+                {
+                    RaisePropertyChanging("FloatingHeight");
+                    _floatingHeight = value;
+                    RaisePropertyChanged("FloatingHeight");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingLeft
+
+        private double _floatingLeft = 0.0;
+        public double FloatingLeft
+        {
+            get { return _floatingLeft; }
+            set
+            {
+                if (_floatingLeft != value)
+                {
+                    RaisePropertyChanging("FloatingLeft");
+                    _floatingLeft = value;
+                    RaisePropertyChanged("FloatingLeft");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingTop
+
+        private double _floatingTop = 0.0;
+        public double FloatingTop
+        {
+            get { return _floatingTop; }
+            set
+            {
+                if (_floatingTop != value)
+                {
+                    RaisePropertyChanging("FloatingTop");
+                    _floatingTop = value;
+                    RaisePropertyChanged("FloatingTop");
+                }
+            }
+        }
+
+        #endregion
+
+        #region IsMaximized
+
+        private bool _isMaximized = false;
+        public bool IsMaximized
+        {
+            get { return _isMaximized; }
+            set
+            {
+                if (_isMaximized != value)
+                {
+                    _isMaximized = value;
+                    RaisePropertyChanged("IsMaximized");
+                }
+            }
+        }
+
+        #endregion
+
+
+        [NonSerialized]
+        double _actualWidth;
+        double ILayoutPositionableElementWithActualSize.ActualWidth
+        {
+            get
+            {
+                return _actualWidth;
+            }
+            set
+            {
+                _actualWidth = value;
+            }
+        }
+
+        [NonSerialized]
+        double _actualHeight;
+        double ILayoutPositionableElementWithActualSize.ActualHeight
+        {
+            get
+            {
+                return _actualHeight;
+            }
+            set
+            {
+                _actualHeight = value;
+            }
+        }
+
+        public override void WriteXml(System.Xml.XmlWriter writer)
+        {
+            if (DockWidth.Value != 1.0 || !DockWidth.IsStar)
+                writer.WriteAttributeString("DockWidth", _gridLengthConverter.ConvertToInvariantString(DockWidth));
+            if (DockHeight.Value != 1.0 || !DockHeight.IsStar)
+                writer.WriteAttributeString("DockHeight", _gridLengthConverter.ConvertToInvariantString(DockHeight));
+
+            if (DockMinWidth != 25.0)
+                writer.WriteAttributeString("DocMinWidth", DockMinWidth.ToString(CultureInfo.InvariantCulture));
+            if (DockMinHeight != 25.0)
+                writer.WriteAttributeString("DockMinHeight", DockMinHeight.ToString(CultureInfo.InvariantCulture));
+
+            if (FloatingWidth != 0.0)
+                writer.WriteAttributeString("FloatingWidth", FloatingWidth.ToString(CultureInfo.InvariantCulture));
+            if (FloatingHeight != 0.0)
+                writer.WriteAttributeString("FloatingHeight", FloatingHeight.ToString(CultureInfo.InvariantCulture));
+            if (FloatingLeft != 0.0)
+                writer.WriteAttributeString("FloatingLeft", FloatingLeft.ToString(CultureInfo.InvariantCulture));
+            if (FloatingTop != 0.0)
+                writer.WriteAttributeString("FloatingTop", FloatingTop.ToString(CultureInfo.InvariantCulture));
+
+            base.WriteXml(writer);
+        }
+
+        static GridLengthConverter _gridLengthConverter = new GridLengthConverter();
+        public override void ReadXml(System.Xml.XmlReader reader)
+        {
+            if (reader.MoveToAttribute("DockWidth"))
+                _dockWidth = (GridLength)_gridLengthConverter.ConvertFromInvariantString(reader.Value);
+            if (reader.MoveToAttribute("DockHeight"))
+                _dockHeight = (GridLength)_gridLengthConverter.ConvertFromInvariantString(reader.Value);
+
+            if (reader.MoveToAttribute("DocMinWidth"))
+                _dockMinWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("DocMinHeight"))
+                _dockMinHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+
+            if (reader.MoveToAttribute("FloatingWidth"))
+                _floatingWidth = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingHeight"))
+                _floatingHeight = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingLeft"))
+                _floatingLeft = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+            if (reader.MoveToAttribute("FloatingTop"))
+                _floatingTop = double.Parse(reader.Value, CultureInfo.InvariantCulture);
+
+            base.ReadXml(reader);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
new file mode 100644
index 000000000..61c376eef
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
@@ -0,0 +1,689 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Collections.ObjectModel;
+using System.Windows.Markup;
+using System.Xml.Serialization;
+using Standard;
+
+namespace Xceed.Wpf.AvalonDock.Layout
+{
+    [ContentProperty("RootPanel")]
+    [Serializable]
+    public class LayoutRoot : LayoutElement, ILayoutContainer, ILayoutRoot
+    {
+        public LayoutRoot()
+        { 
+            RightSide = new LayoutAnchorSide();
+            LeftSide = new LayoutAnchorSide();
+            TopSide = new LayoutAnchorSide();
+            BottomSide = new LayoutAnchorSide();
+            RootPanel = new LayoutPanel(new LayoutDocumentPane());
+        }
+
+
+        #region RootPanel
+
+        private LayoutPanel _rootPanel;
+        public LayoutPanel RootPanel
+        {
+            get { return _rootPanel; }
+            set
+            {
+                if (_rootPanel != value)
+                {
+                    RaisePropertyChanging("RootPanel");
+                    if (_rootPanel != null &&
+                        _rootPanel.Parent == this)
+                        _rootPanel.Parent = null;
+                    _rootPanel = value;
+
+                    if (_rootPanel == null)
+                        _rootPanel = new LayoutPanel(new LayoutDocumentPane());
+
+                    if (_rootPanel != null)
+                        _rootPanel.Parent = this;
+                    RaisePropertyChanged("RootPanel");
+                }
+            }
+        }
+
+        #endregion
+
+        #region TopSide
+
+        private LayoutAnchorSide _topSide = null;
+        public LayoutAnchorSide TopSide
+        {
+            get { return _topSide; }
+            set
+            {
+                if (_topSide != value)
+                {
+                    RaisePropertyChanging("TopSide");
+                    _topSide = value;
+                    if (_topSide != null)
+                        _topSide.Parent = this;
+                    RaisePropertyChanged("TopSide");
+                }
+            }
+        }
+
+        #endregion
+
+        #region RightSide
+
+        private LayoutAnchorSide _rightSide;
+        public LayoutAnchorSide RightSide
+        {
+            get { return _rightSide; }
+            set
+            {
+                if (_rightSide != value)
+                {
+                    RaisePropertyChanging("RightSide");
+                    _rightSide = value;
+                    if (_rightSide != null)
+                        _rightSide.Parent = this;
+                    RaisePropertyChanged("RightSide");
+                }
+            }
+        }
+
+        #endregion
+
+        #region LeftSide
+
+        private LayoutAnchorSide _leftSide = null;
+        public LayoutAnchorSide LeftSide
+        {
+            get { return _leftSide; }
+            set
+            {
+                if (_leftSide != value)
+                {
+                    RaisePropertyChanging("LeftSide");
+                    _leftSide = value;
+                    if (_leftSide != null)
+                        _leftSide.Parent = this;
+                    RaisePropertyChanged("LeftSide");
+                }
+            }
+        }
+
+        #endregion
+
+        #region BottomSide
+
+        private LayoutAnchorSide _bottomSide = null;
+        public LayoutAnchorSide BottomSide
+        {
+            get { return _bottomSide; }
+            set
+            {
+                if (_bottomSide != value)
+                {
+                    RaisePropertyChanging("BottomSide");
+                    _bottomSide = value;
+                    if (_bottomSide != null)
+                        _bottomSide.Parent = this;
+                    RaisePropertyChanged("BottomSide");
+                }
+            }
+        }
+
+        #endregion
+
+        #region FloatingWindows
+        ObservableCollection<LayoutFloatingWindow> _floatingWindows = null;
+
+        public ObservableCollection<LayoutFloatingWindow> FloatingWindows
+        {
+            get 
+            {
+                if (_floatingWindows == null)
+                {
+                    _floatingWindows = new ObservableCollection<LayoutFloatingWindow>();
+                    _floatingWindows.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(_floatingWindows_CollectionChanged);
+                }
+
+                return _floatingWindows; 
+            }
+        }
+
+        void _floatingWindows_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.OldItems != null && (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                foreach (LayoutFloatingWindow element in e.OldItems)
+                {
+                    if (element.Parent == this)
+                        element.Parent = null;
+                }
+            } 
+
+            if (e.NewItems != null && (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace))
+            {
+                foreach (LayoutFloatingWindow element in e.NewItems)
+                    element.Parent = this;
+            }
+        }
+        #endregion
+
+        #region HiddenAnchorables
+
+        ObservableCollection<LayoutAnchorable> _hiddenAnchorables = null;
+
+        public ObservableCollection<LayoutAnchorable> Hidden
+        {
+            get
+            {
+                if (_hiddenAnchorables == null)
+                {
+                    _hiddenAnchorables = new ObservableCollection<LayoutAnchorable>();
+                    _hiddenAnchorables.CollectionChanged += new System.Collections.Specialized.NotifyCollectionChangedEventHandler(_hiddenAnchorables_CollectionChanged);
+                }
+
+                return _hiddenAnchorables;
+            }
+        }
+
+        void _hiddenAnchorables_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
+        {
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.OldItems != null)
+                {
+                    foreach (LayoutAnchorable element in e.OldItems)
+                    {
+                        if (element.Parent == this)
+                            element.Parent = null;
+                    }
+                }
+            }
+
+            if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Add ||
+                e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Replace)
+            {
+                if (e.NewItems != null)
+                {
+                    foreach (LayoutAnchorable element in e.NewItems)
+                    {
+                        if (element.Parent != this)
+                        {
+                            if (element.Parent != null)
+                                element.Parent.RemoveChild(element);
+                            element.Parent = this;
+                        }
+
+                    }
+                }
+            }
+
+
+
+        }
+
+        #endregion
+
+        #region Children
+        public IEnumerable<ILayoutElement> Children
+        {
+            get
+            {
+                if (RootPanel != null)
+                    yield return RootPanel;
+                if (_floatingWindows != null)
+                {
+                    foreach (var floatingWindow in _floatingWindows)
+                        yield return floatingWindow;
+                }
+                if (TopSide != null)
+                    yield return TopSide;
+                if (RightSide != null)
+                    yield return RightSide;
+                if (BottomSide != null)
+                    yield return BottomSide;
+                if (LeftSide != null)
+                    yield return LeftSide;
+                if (_hiddenAnchorables != null)
+                {
+                    foreach (var hiddenAnchorable in _hiddenAnchorables)
+                        yield return hiddenAnchorable;
+                }
+            }
+        }
+        public void RemoveChild(ILayoutElement element)
+        {
+            if (element == RootPanel)
+                RootPanel = null;
+            else if (_floatingWindows != null && _floatingWindows.Contains(element))
+                _floatingWindows.Remove(element as LayoutFloatingWindow);
+            else if (_hiddenAnchorables != null && _hiddenAnchorables.Contains(element))
+                _hiddenAnchorables.Remove(element as LayoutAnchorable);
+            else if (element == TopSide)
+                TopSide = null;
+            else if (element == RightSide)
+                RightSide = null;
+            else if (element == BottomSide)
+                BottomSide = null;
+            else if (element == LeftSide)
+                LeftSide = null;
+
+        }
+
+        public void ReplaceChild(ILayoutElement oldElement, ILayoutElement newElement)
+        {
+            if (oldElement == RootPanel)
+                RootPanel = (LayoutPanel)newElement;
+            else if (_floatingWindows != null && _floatingWindows.Contains(oldElement))
+            {
+                int index = _floatingWindows.IndexOf(oldElement as LayoutFloatingWindow);
+                _floatingWindows.Remove(oldElement as LayoutFloatingWindow);
+                _floatingWindows.Insert(index, newElement as LayoutFloatingWindow);
+            }
+            else if (_hiddenAnchorables != null && _hiddenAnchorables.Contains(oldElement))
+            {
+                int index = _hiddenAnchorables.IndexOf(oldElement as LayoutAnchorable);
+                _hiddenAnchorables.Remove(oldElement as LayoutAnchorable);
+                _hiddenAnchorables.Insert(index, newElement as LayoutAnchorable);
+            }
+            else if (oldElement == TopSide)
+                TopSide = (LayoutAnchorSide)newElement;
+            else if (oldElement == RightSide)
+                RightSide = (LayoutAnchorSide)newElement;
+            else if (oldElement == BottomSide)
+                BottomSide = (LayoutAnchorSide)newElement;
+            else if (oldElement == LeftSide)
+                LeftSide = (LayoutAnchorSide)newElement;
+        }
+
+        public int ChildrenCount
+        {
+            get
+            {
+                return 5 +
+                    (_floatingWindows != null ? _floatingWindows.Count : 0) + 
+                    (_hiddenAnchorables != null ? _hiddenAnchorables.Count : 0); 
+            }
+        }
+        #endregion
+
+        #region ActiveContent
+
+        [field:NonSerialized]
+        private WeakReference _activeContent = null;
+        private bool _activeContentSet = false;
+
+        [XmlIgnore]
+        public LayoutContent ActiveContent
+        {
+            get { return _activeContent.GetValueOrDefault<LayoutContent>(); }
+            set
+            {
+                var currentValue = ActiveContent;
+                if (currentValue != value)
+                {
+                    InternalSetActiveContent(currentValue, value);
+                }
+            }
+        }
+
+        void InternalSetActiveContent(LayoutContent currentValue, LayoutContent newActiveContent)
+        {
+            RaisePropertyChanging("ActiveContent");
+            if (currentValue != null)
+                currentValue.IsActive = false;
+            _activeContent = new WeakReference(newActiveContent);
+            currentValue = ActiveContent;
+            if (currentValue != null)
+                currentValue.IsActive = true;
+            RaisePropertyChanged("ActiveContent");
+            _activeContentSet = currentValue != null;
+            if (currentValue != null)
+            {
+                if (currentValue.Parent is LayoutDocumentPane || currentValue is LayoutDocument)
+                    LastFocusedDocument = currentValue;
+            }
+            else
+                LastFocusedDocument = null;
+        }
+
+        void UpdateActiveContentProperty()
+        {
+            var activeContent = ActiveContent;
+            if (_activeContentSet && (activeContent == null || activeContent.Root != this))
+            {
+                _activeContentSet = false;
+                InternalSetActiveContent(activeContent, null);
+            }
+        }
+        #endregion
+
+        #region LastFocusedDocument
+
+        [field: NonSerialized]
+        private WeakReference _lastFocusedDocument = null;
+        [field: NonSerialized]
+        private bool _lastFocusedDocumentSet = false;
+
+        [XmlIgnore]
+        public LayoutContent LastFocusedDocument
+        {
+            get { return _lastFocusedDocument.GetValueOrDefault<LayoutContent>(); }
+            private set
+            {
+                var currentValue = LastFocusedDocument;
+                if (currentValue != value)
+                {
+                    RaisePropertyChanging("LastFocusedDocument");
+                    if (currentValue != null)
+                        currentValue.IsLastFocusedDocument = false;
+                    _lastFocusedDocument = new WeakReference(value);
+                    currentValue = LastFocusedDocument;
+                    if (currentValue != null)
+                        currentValue.IsLastFocusedDocument = true;
+                    _lastFocusedDocumentSet = currentValue != null;
+                    RaisePropertyChanged("LastFocusedDocument");
+                }
+            }
+        }
+
+        #endregion
+
+        #region Manager
+
+
+        [NonSerialized]
+        private DockingManager _manager = null;
+
+        [XmlIgnore]
+        public DockingManager Manager
+        {
+            get { return _manager; }
+            internal set
+            {
+                if (_manager != value)
+                {
+                    RaisePropertyChanging("Manager");
+                    _manager = value;
+                    RaisePropertyChanged("Manager");
+                }
+            }
+        }
+
+        #endregion
+
+        #region CollectGarbage
+
+        /// <summary>
+        /// Removes any empty container not directly referenced by other layout items
+        /// </summary>
+        public void CollectGarbage()
+        {
+            bool exitFlag = true;
+
+            #region collect empty panes
+            do
+            {
+                exitFlag = true;
+
+                //for each content that references via PreviousContainer a disconnected Pane set the property to null
+                foreach (var content in this.Descendents().OfType<ILayoutPreviousContainer>().Where(c => c.PreviousContainer != null && 
+                    (c.PreviousContainer.Parent == null || c.PreviousContainer.Parent.Root != this)))
+                {
+                    content.PreviousContainer = null;
+                }
+
+                //for each pane that is empty
+                foreach (var emptyPane in this.Descendents().OfType<ILayoutPane>().Where(p => p.ChildrenCount == 0))
+                {
+                    //...set null any reference coming from contents not yet hosted in a floating window
+                    foreach (var contentReferencingEmptyPane in this.Descendents().OfType<LayoutContent>()
+                        .Where(c => ((ILayoutPreviousContainer)c).PreviousContainer == emptyPane && !c.IsFloating))
+                    {
+                        if (contentReferencingEmptyPane is LayoutAnchorable &&
+                            !((LayoutAnchorable)contentReferencingEmptyPane).IsVisible)
+                            continue;
+
+                        ((ILayoutPreviousContainer)contentReferencingEmptyPane).PreviousContainer = null;
+                        contentReferencingEmptyPane.PreviousContainerIndex = -1;
+                    }
+
+                    //...if this pane is the only documentpane present in the layout than skip it
+                    if (emptyPane is LayoutDocumentPane &&
+                        this.Descendents().OfType<LayoutDocumentPane>().Count(c => c != emptyPane) == 0)
+                        continue;
+
+                    //...if this empty panes is not referenced by anyone, than removes it from its parent container
+                    if (!this.Descendents().OfType<ILayoutPreviousContainer>().Any(c => c.PreviousContainer == emptyPane))
+                    {
+                        var parentGroup = emptyPane.Parent as ILayoutContainer;
+                        parentGroup.RemoveChild(emptyPane);
+                        exitFlag = false;
+                        break;
+                    }
+                }
+
+                if (!exitFlag)
+                {
+                    //removes any empty anchorable pane group
+                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where(p => p.ChildrenCount == 0))
+                    {
+                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+                        parentGroup.RemoveChild(emptyPaneGroup);
+                        exitFlag = false;
+                        break;
+                    }
+                }
+
+                if (!exitFlag)
+                {
+                    //removes any empty layout panel
+                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutPanel>().Where(p => p.ChildrenCount == 0))
+                    {
+                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+                        parentGroup.RemoveChild(emptyPaneGroup);
+                        exitFlag = false;
+                        break;
+                    }
+                }
+
+                if (!exitFlag)
+                {
+                    //removes any empty floating window
+                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutFloatingWindow>().Where(p => p.ChildrenCount == 0))
+                    {
+                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+                        parentGroup.RemoveChild(emptyPaneGroup);
+                        exitFlag = false;
+                        break;
+                    }
+                }
+
+                if (!exitFlag)
+                {
+                    //removes any empty anchor group
+                    foreach (var emptyPaneGroup in this.Descendents().OfType<LayoutAnchorGroup>().Where(p => p.ChildrenCount == 0))
+                    {
+                        var parentGroup = emptyPaneGroup.Parent as ILayoutContainer;
+                        parentGroup.RemoveChild(emptyPaneGroup);
+                        exitFlag = false;
+                        break;
+                    }
+                }
+
+            }
+            while (!exitFlag);
+            #endregion
+
+            #region collapse single child anchorable pane groups
+            do
+            {
+                exitFlag = true;
+                //for each pane that is empty
+                foreach (var paneGroupToCollapse in this.Descendents().OfType<LayoutAnchorablePaneGroup>().Where(p => p.ChildrenCount == 1 && p.Children[0] is LayoutAnchorablePaneGroup).ToArray())
+                {
+                    var singleChild = paneGroupToCollapse.Children[0] as LayoutAnchorablePaneGroup;
+                    paneGroupToCollapse.Orientation = singleChild.Orientation;
+                    paneGroupToCollapse.RemoveChild(singleChild);
+                    while (singleChild.ChildrenCount > 0)
+                    {
+                        paneGroupToCollapse.InsertChildAt(
+                            paneGroupToCollapse.ChildrenCount, singleChild.Children[0]);
+                    }
+
+                    exitFlag = false;
+                    break;
+                }
+
+            }
+            while (!exitFlag);
+
+
+
+            #endregion
+
+            #region collapse single child document pane groups
+            do
+            {
+                exitFlag = true;
+                //for each pane that is empty
+                foreach (var paneGroupToCollapse in this.Descendents().OfType<LayoutDocumentPaneGroup>().Where(p => p.ChildrenCount == 1 && p.Children[0] is LayoutDocumentPaneGroup).ToArray())
+                {
+                    var singleChild = paneGroupToCollapse.Children[0] as LayoutDocumentPaneGroup;
+                    paneGroupToCollapse.Orientation = singleChild.Orientation;
+                    paneGroupToCollapse.RemoveChild(singleChild);
+                    while (singleChild.ChildrenCount > 0)
+                    {
+                        paneGroupToCollapse.InsertChildAt(
+                            paneGroupToCollapse.ChildrenCount, singleChild.Children[0]);
+                    }
+
+                    exitFlag = false;
+                    break;
+                }
+
+            }
+            while (!exitFlag);
+
+
+
+            #endregion
+
+            #region collapse single child layout panels
+            do
+            {
+                exitFlag = true;
+                //for each panel that has only one child
+                foreach (var panelToCollapse in this.Descendents().OfType<LayoutPanel>().Where(p => p.ChildrenCount == 1 && p.Children[0] is LayoutPanel).ToArray())
+                {
+                    var singleChild = panelToCollapse.Children[0] as LayoutPanel;
+                    panelToCollapse.Orientation = singleChild.Orientation;
+                    panelToCollapse.RemoveChild(singleChild);
+                    while (singleChild.ChildrenCount > 0)
+                    {
+                        panelToCollapse.InsertChildAt(
+                            panelToCollapse.ChildrenCount, singleChild.Children[0]);
+                    }
+
+                    exitFlag = false;
+                    break;
+                }
+
+            }
+            while (!exitFlag);
+            #endregion
+
+            #region Update ActiveContent and LastFocusedDocument properties
+            UpdateActiveContentProperty();
+            #endregion
+#if DEBUG
+            System.Diagnostics.Debug.Assert(
+                !this.Descendents().OfType<LayoutAnchorablePane>().Any(a => a.ChildrenCount == 0 && a.IsVisible));
+#if TRACE
+            RootPanel.ConsoleDump(4);
+#endif
+#endif
+        }
+
+        #endregion
+
+        public event EventHandler Updated;
+
+        internal void FireLayoutUpdated()
+        {
+            if (Updated != null)
+                Updated(this, EventArgs.Empty);
+        }
+
+        #region LayoutElement Added/Removed events
+
+        internal void OnLayoutElementAdded(LayoutElement element)
+        {
+            if (ElementAdded != null)
+                ElementAdded(this, new LayoutElementEventArgs(element));
+        }
+
+        public event EventHandler<LayoutElementEventArgs> ElementAdded;
+
+        internal void OnLayoutElementRemoved(LayoutElement element)
+        {
+            if (element.Descendents().OfType<LayoutContent>().Any(c => c == LastFocusedDocument))
+                LastFocusedDocument = null;
+            if (element.Descendents().OfType<LayoutContent>().Any(c => c == ActiveContent))
+                ActiveContent = null;
+            if (ElementRemoved != null)
+                ElementRemoved(this, new LayoutElementEventArgs(element));
+        }
+
+        public event EventHandler<LayoutElementEventArgs> ElementRemoved;
+
+        #endregion
+
+#if TRACE
+        public override void ConsoleDump(int tab)
+        {
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "RootPanel()" );
+
+          RootPanel.ConsoleDump(tab + 1);
+
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "FloatingWindows()" );
+
+          foreach (LayoutFloatingWindow fw in FloatingWindows)
+              fw.ConsoleDump(tab + 1);
+
+          System.Diagnostics.Trace.Write( new string( ' ', tab * 4 ) );
+          System.Diagnostics.Trace.WriteLine( "Hidden()" );
+
+          foreach (LayoutAnchorable hidden in Hidden)
+              hidden.ConsoleDump(tab + 1);
+        }
+#endif
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
new file mode 100644
index 000000000..554e29645
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
@@ -0,0 +1,38 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.AvalonDock.Layout.Serialization
+{
+    public class LayoutSerializationCallbackEventArgs : CancelEventArgs
+    {
+        public LayoutSerializationCallbackEventArgs(LayoutContent model, object previousContent)
+        {
+            Cancel = false;
+            Model = model;
+            Content = previousContent;
+        }
+
+        public LayoutContent Model { get; private set; }
+
+        public object Content { get; set; }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
new file mode 100644
index 000000000..32f37c5c3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
@@ -0,0 +1,138 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.IO;
+using Xceed.Wpf.AvalonDock.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Layout.Serialization
+{
+    public abstract class LayoutSerializer
+    {
+        DockingManager _manager;
+
+        public LayoutSerializer(DockingManager manager)
+        {
+            if (manager == null)
+                throw new ArgumentNullException("manager");
+
+            _manager = manager;
+            _previousAnchorables = _manager.Layout.Descendents().OfType<LayoutAnchorable>().ToArray();
+            _previousDocuments = _manager.Layout.Descendents().OfType<LayoutDocument>().ToArray();
+        }
+
+        LayoutAnchorable[] _previousAnchorables = null;
+        LayoutDocument[] _previousDocuments = null;
+
+        public DockingManager Manager
+        {
+            get { return _manager; }
+        }
+
+        public event EventHandler<LayoutSerializationCallbackEventArgs> LayoutSerializationCallback;
+
+        protected virtual void FixupLayout(LayoutRoot layout)
+        {
+            //fix container panes
+            foreach (var lcToAttach in layout.Descendents().OfType<ILayoutPreviousContainer>().Where(lc => lc.PreviousContainerId != null))
+            {
+                var paneContainerToAttach = layout.Descendents().OfType<ILayoutPaneSerializable>().FirstOrDefault(lps => lps.Id == lcToAttach.PreviousContainerId);
+                if (paneContainerToAttach == null)
+                    throw new ArgumentException(string.Format("Unable to find a pane with id ='{0}'", lcToAttach.PreviousContainerId));
+
+                lcToAttach.PreviousContainer = paneContainerToAttach as ILayoutContainer;
+            }
+
+
+            //now fix the content of the layoutcontents
+            foreach (var lcToFix in layout.Descendents().OfType<LayoutAnchorable>().Where(lc => lc.Content == null).ToArray())
+            {
+                LayoutAnchorable previousAchorable = null;
+                if (lcToFix.ContentId != null)
+                { 
+                    //try find the content in replaced layout
+                    previousAchorable = _previousAnchorables.FirstOrDefault(a => a.ContentId == lcToFix.ContentId);
+                }
+
+                if (LayoutSerializationCallback != null)
+                {
+                    var args = new LayoutSerializationCallbackEventArgs(lcToFix, previousAchorable != null ? previousAchorable.Content : null);
+                    LayoutSerializationCallback(this, args);
+                    if (args.Cancel)
+                        lcToFix.Close();
+                    else if (args.Content != null)
+                        lcToFix.Content = args.Content;
+                    else if (args.Model.Content != null)
+                        lcToFix.Hide(false);
+                }
+                else if (previousAchorable == null)
+                    lcToFix.Hide(false);
+                else
+                {
+                    lcToFix.Content = previousAchorable.Content;
+                    lcToFix.IconSource = previousAchorable.IconSource;
+                }
+            }
+
+
+            foreach (var lcToFix in layout.Descendents().OfType<LayoutDocument>().Where(lc => lc.Content == null).ToArray())
+            {
+                LayoutDocument previousDocument = null;
+                if (lcToFix.ContentId != null)
+                {
+                    //try find the content in replaced layout
+                    previousDocument = _previousDocuments.FirstOrDefault(a => a.ContentId == lcToFix.ContentId);
+                }
+
+                if (LayoutSerializationCallback != null)
+                {
+                    var args = new LayoutSerializationCallbackEventArgs(lcToFix, previousDocument != null ? previousDocument.Content : null);
+                    LayoutSerializationCallback(this, args);
+
+                    if (args.Cancel)
+                        lcToFix.Close();
+                    else if (args.Content != null)
+                        lcToFix.Content = args.Content;
+                    else if (args.Model.Content != null)
+                        lcToFix.Close();
+                }
+                else if (previousDocument == null)
+                    lcToFix.Close();
+                else
+                    lcToFix.Content = previousDocument.Content;
+            }
+
+
+            layout.CollectGarbage();
+        }
+
+        protected void StartDeserialization()
+        {
+            Manager.SuspendDocumentsSourceBinding = true;
+            Manager.SuspendAnchorablesSourceBinding = true;
+        }
+
+        protected void EndDeserialization()
+        {
+            Manager.SuspendDocumentsSourceBinding = false;
+            Manager.SuspendAnchorablesSourceBinding = false;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
new file mode 100644
index 000000000..a97e32778
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
@@ -0,0 +1,110 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Xml.Serialization;
+using System.IO;
+
+namespace Xceed.Wpf.AvalonDock.Layout.Serialization
+{
+    public class XmlLayoutSerializer : LayoutSerializer
+    {
+        public XmlLayoutSerializer(DockingManager manager)
+            : base(manager)
+        { 
+
+        }
+
+        public void Serialize(System.Xml.XmlWriter writer)
+        {
+            var serializer = new XmlSerializer(typeof(LayoutRoot));
+            serializer.Serialize(writer, Manager.Layout);
+        }
+        public void Serialize(System.IO.TextWriter writer)
+        {
+            var serializer = new XmlSerializer(typeof(LayoutRoot));
+            serializer.Serialize(writer, Manager.Layout);
+        }
+        public void Serialize(System.IO.Stream stream)
+        {
+            var serializer = new XmlSerializer(typeof(LayoutRoot));
+            serializer.Serialize(stream, Manager.Layout);
+        }
+
+        public void Serialize(string filepath)
+        {
+            using (var stream = new StreamWriter(filepath))
+                Serialize(stream);
+        }
+
+        public void Deserialize(System.IO.Stream stream)
+        {
+            try
+            {
+                StartDeserialization();
+                var serializer = new XmlSerializer(typeof(LayoutRoot));
+                var layout = serializer.Deserialize(stream) as LayoutRoot;
+                FixupLayout(layout);
+                Manager.Layout = layout;
+            }
+            finally
+            {
+                EndDeserialization();
+            }
+        }
+
+        public void Deserialize(System.IO.TextReader reader)
+        {
+            try
+            {
+                StartDeserialization();
+                var serializer = new XmlSerializer(typeof(LayoutRoot));
+                var layout = serializer.Deserialize(reader) as LayoutRoot;
+                FixupLayout(layout);
+                Manager.Layout = layout;
+            }
+            finally
+            {
+                EndDeserialization();
+            }
+        }
+
+        public void Deserialize(System.Xml.XmlReader reader)
+        {
+            try
+            {
+                StartDeserialization();
+                var serializer = new XmlSerializer(typeof(LayoutRoot));
+                var layout = serializer.Deserialize(reader) as LayoutRoot;
+                FixupLayout(layout);
+                Manager.Layout = layout;
+            }
+            finally
+            {
+                EndDeserialization();
+            }
+        }
+
+        public void Deserialize(string filepath)
+        {
+            using (var stream = new StreamReader(filepath))
+                Deserialize(stream);
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
new file mode 100644
index 000000000..25a6aa5c1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
@@ -0,0 +1,38 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.AvalonDock.Layout;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    class LayoutEventArgs : EventArgs
+    {
+        public LayoutEventArgs(LayoutRoot layoutRoot)
+        {
+            LayoutRoot = layoutRoot;
+        }
+
+        public LayoutRoot LayoutRoot
+        {
+            get;
+            private set;
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
new file mode 100644
index 000000000..261f37fb4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
@@ -0,0 +1,46 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    internal static class MathHelper
+    {
+
+        public static double MinMax(double value, double min, double max)
+        {
+            if (min > max)
+                throw new ArgumentException("min>max");
+
+            if (value < min)
+                return min;
+            if (value > max)
+                return max;
+
+            return value;
+        }
+
+        public static void AssertIsPositiveOrZero(double value)
+        {
+            if (value < 0.0)
+                throw new ArgumentException("Invalid value, must be a positive number or equal to zero");
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..0c7fe7020
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
@@ -0,0 +1,76 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+using System.Windows.Markup;
+using System;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyDescription( "This assembly implements the Xceed.Wpf.AvalonDock namespace, a docking layout system for the Windows Presentation Framework." )]
+
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - AvalonDock" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
+[assembly: AssemblyCulture( "" )]
+
+
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+[assembly: CLSCompliant( true )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.SourceAssembly, //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)
+)]
+
+[assembly: XmlnsPrefix( "http://schemas.xceed.com/wpf/xaml/avalondock", "xcad" )]
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock" )]
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Controls" )]
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Converters" )]
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Layout" )]
+[assembly: XmlnsDefinition( "http://schemas.xceed.com/wpf/xaml/avalondock", "Xceed.Wpf.AvalonDock.Themes" )]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
+
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..92766506d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
@@ -0,0 +1,250 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.296
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Xceed.Wpf.AvalonDock.Properties {
+    using System;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    public class Resources {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.AvalonDock.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Auto Hide.
+        /// </summary>
+        public static string Anchorable_AutoHide {
+            get {
+                return ResourceManager.GetString("Anchorable_AutoHide", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Auto Hide.
+        /// </summary>
+        public static string Anchorable_BtnAutoHide_Hint {
+            get {
+                return ResourceManager.GetString("Anchorable_BtnAutoHide_Hint", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Hide.
+        /// </summary>
+        public static string Anchorable_BtnClose_Hint {
+            get {
+                return ResourceManager.GetString("Anchorable_BtnClose_Hint", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Window Position.
+        /// </summary>
+        public static string Anchorable_CxMenu_Hint {
+            get {
+                return ResourceManager.GetString("Anchorable_CxMenu_Hint", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Dock.
+        /// </summary>
+        public static string Anchorable_Dock {
+            get {
+                return ResourceManager.GetString("Anchorable_Dock", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Dock as Tabbed Document.
+        /// </summary>
+        public static string Anchorable_DockAsDocument {
+            get {
+                return ResourceManager.GetString("Anchorable_DockAsDocument", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Float.
+        /// </summary>
+        public static string Anchorable_Float {
+            get {
+                return ResourceManager.GetString("Anchorable_Float", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Close.
+        /// </summary>
+        public static string Anchorable_Hide {
+            get {
+                return ResourceManager.GetString("Anchorable_Hide", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Close.
+        /// </summary>
+        public static string Document_Close {
+            get {
+                return ResourceManager.GetString("Document_Close", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Close All But This.
+        /// </summary>
+        public static string Document_CloseAllButThis {
+            get {
+                return ResourceManager.GetString("Document_CloseAllButThis", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Window Position.
+        /// </summary>
+        public static string Document_CxMenu_Hint {
+            get {
+                return ResourceManager.GetString("Document_CxMenu_Hint", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Dock as Tabbed Document.
+        /// </summary>
+        public static string Document_DockAsDocument {
+            get {
+                return ResourceManager.GetString("Document_DockAsDocument", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Float.
+        /// </summary>
+        public static string Document_Float {
+            get {
+                return ResourceManager.GetString("Document_Float", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Move To Next Tab Group.
+        /// </summary>
+        public static string Document_MoveToNextTabGroup {
+            get {
+                return ResourceManager.GetString("Document_MoveToNextTabGroup", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Move To Previous Tab Group.
+        /// </summary>
+        public static string Document_MoveToPreviousTabGroup {
+            get {
+                return ResourceManager.GetString("Document_MoveToPreviousTabGroup", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to New Horizontal Tab Group.
+        /// </summary>
+        public static string Document_NewHorizontalTabGroup {
+            get {
+                return ResourceManager.GetString("Document_NewHorizontalTabGroup", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to New Vertical Tab Group.
+        /// </summary>
+        public static string Document_NewVerticalTabGroup {
+            get {
+                return ResourceManager.GetString("Document_NewVerticalTabGroup", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Maximize.
+        /// </summary>
+        public static string Window_Maximize {
+            get {
+                return ResourceManager.GetString("Window_Maximize", resourceCulture);
+            }
+        }
+
+        /// <summary>
+        ///   Looks up a localized string similar to Restore.
+        /// </summary>
+        public static string Window_Restore {
+            get {
+                return ResourceManager.GetString("Window_Restore", resourceCulture);
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx
new file mode 100644
index 000000000..aa2df0fc2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.resx
@@ -0,0 +1,159 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Automatisch im Hintergrund</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Automatisch im Hintergrund</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Schließen</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Fensterposition</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Andocken</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Als Dokument im Registerkartenformat andocken</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Verankerung aufheben</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Schließen</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Schließen</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Alle ausser diesem schließen</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Fensterposition</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Als Dokument andocken</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Verankerung aufheben</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Zur nächsten Registerkartengruppe wechseln</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Zur vorherigen Registerkartengruppe wechseln</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Neue horizontale Registerkartengruppe</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Neue vertikale Registerkartengruppe</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximieren</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Wiederherstellen</value>
+  </data>  
+  
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx
new file mode 100644
index 000000000..5403ddcc8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.resx
@@ -0,0 +1,160 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+
+<data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Esconder Automáticamente</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Esconder Automáticamente</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Esconder</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Posición de Ventana </value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Anclar</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Anclar como Documento en Ficha</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Ventana Flotante</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Cerrar</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Cerrar</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Cerrar Todo, Pero Este</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Posición de Ventana</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Anclar como Documento en Ficha</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Ventana Flotante</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Mover al Grupo de Fichas Siguiente</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Mover al Grupo de Fichas Anterior</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Nuevo Grupo de Fichas Horizontal</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Nuevo Grupo de Fichas Vertical</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximizar</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Restaurar</value>
+  </data>
+
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx
new file mode 100644
index 000000000..5e50b1a5e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.resx
@@ -0,0 +1,159 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+    <data name="Anchorable_AutoHide" xml:space="preserve">
+        <value>Cacher Automatiquement</value>
+      </data>
+      <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+        <value>Cacher Automatiquement</value>
+      </data>
+      <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+        <value>Cacher</value>
+      </data>
+      <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+        <value>Position de la Fenêtre</value>
+      </data>
+      <data name="Anchorable_Dock" xml:space="preserve">
+        <value>Ancrer</value>
+      </data>
+      <data name="Anchorable_DockAsDocument" xml:space="preserve">
+        <value>Ancrer comme Onglet de Document</value>
+      </data>
+      <data name="Anchorable_Float" xml:space="preserve">
+        <value>Flottante</value>
+      </data>
+      <data name="Anchorable_Hide" xml:space="preserve">
+        <value>Fermer</value>
+      </data>
+      <data name="Document_Close" xml:space="preserve">
+        <value>Fermer</value>
+      </data>
+      <data name="Document_CloseAllButThis" xml:space="preserve">
+        <value>Fermer Tout Sauf Ceci</value>
+      </data>
+      <data name="Document_CxMenu_Hint" xml:space="preserve">
+        <value>Position de la Fenêtre</value>
+      </data>
+      <data name="Document_DockAsDocument" xml:space="preserve">
+        <value>Ancrer Comme Onglet de Document</value>
+      </data>
+      <data name="Document_Float" xml:space="preserve">
+        <value>Flottante</value>
+      </data>
+      <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+        <value>Déplacer Vers Le Groupe d'Onglets Suivant</value>
+      </data>
+      <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+        <value>Déplacer Vers Le Groupe d'Onglets Précédent</value>
+      </data>
+      <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+        <value>Nouveau Groupe d'Onglets Horizontal</value>
+      </data>
+      <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+        <value>Nouveau Groupe d'Onglets Vertical</value>
+      </data>
+      <data name="Window_Maximize" xml:space="preserve">
+        <value>Plein Écran</value>
+      </data>
+      <data name="Window_Restore" xml:space="preserve">
+        <value>Restaurer</value>
+      </data>
+
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx
new file mode 100644
index 000000000..57cf54bd4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.resx
@@ -0,0 +1,158 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Automatikus elrejtés</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Automatikus elrejtés</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Elrejtés</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Elhelyezkedés</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Dokkolás</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Dokkolás dokumentumfülként</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Lebegő</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Elrejtés</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Bezárás</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Ennek kivételével az összes bezárása</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Elhelyezkedés</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Dokkolás dokumentumfülként</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Lebegő</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Mozgatás a következő fülcsoportra</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Mozgatás az előző fülcsoportra</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Új vízszintes fülcsoport</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Új függőleges fülcsoport</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Teljes méret</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Visszaállítás</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx
new file mode 100644
index 000000000..886be28ea
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.resx
@@ -0,0 +1,177 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Nascondi Automaticamente</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Nascondi Automaticamente</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Nascondi</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Posizione della Finestra</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Ancora</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Ancora come Documento</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Finestra Mobile</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Chiudi</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Chiudi Tutti Tranne Questo</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Posizione della Finestra</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Ancora come Documento</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Finestra Mobile</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Muovi al Gruppo Successivo</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Muovi al Gruppo Precedente</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Nuovo Gruppo Orizzontale</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Nuovo Gruppo Verticale</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Ingrandisci</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Ripristina</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx
new file mode 100644
index 000000000..f34cf1e80
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.resx
@@ -0,0 +1,158 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Esconder Automaticamente</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Esconder Automaticamente</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Esconder</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Posição da Janela</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Ancorar</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Ancorar Como Documento em Aba</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Flutuar</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Fechar</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Fechar</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Fechar Todos Menos Este</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Posição da Janela</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Ancorar como Documento em Aba</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Janela Flutuante</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Mover para o Próximo Grupo de Documentos</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Mover para o Grupo de Documentos Anterior</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Novo Grupo de Documentos Horizontal</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Novo Grupo de Documentos Vertical</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximizar</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Recuperar</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx
new file mode 100644
index 000000000..0a2edd6cd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.resx
@@ -0,0 +1,177 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Auto Hide</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Auto Hide</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Hide</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Window Position</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Dock</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Dock as Tabbed Document</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Float</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Close</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Close All But This</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Window Position</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Dock as Tabbed Document</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Float</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Move To Next Tab Group</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Move To Previous Tab Group</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>New Horizontal Tab Group</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>New Vertical Tab Group</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximize</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Restore</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx
new file mode 100644
index 000000000..3df623221
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.resx
@@ -0,0 +1,159 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Ascunde automat</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Ascunde automat</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Ascunde</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Poziția ferestrei</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Dochează</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Dochează ca și document</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Plutește</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Închide</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Închide</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Închide tot fără documentul curent</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Poziția ferestrei</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Dochează ca și document</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Plutește</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Mută către grup de taburi următor</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Mută către grup de taburi anterior</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Grup nou de taburi orizontal</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Grup nou de taburi vertical</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximizează</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Restaurează</value>
+  </data>
+
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx
new file mode 100644
index 000000000..37850c469
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.resx
@@ -0,0 +1,158 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Скрывать Автоматически</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Скрывать Автоматически</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Скрыть</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Положение Окна</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Присоединить</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Присоединить как Документ</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Отсоединить</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Закрыть</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Закрыть</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Закрыть Все кроме Этого</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Положение Окна</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Присоединить как Документ</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Отсоединить</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Перейти к Следующей Группе Вкладок</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Перейти к Предыдущей Группе Вкладок</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Новая Горизонтальная Группа Вкладок</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Новая Вертикальная Группа Вкладок</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Развернуть</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Восстановить</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx
new file mode 100644
index 000000000..df40f57af
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.resx
@@ -0,0 +1,158 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Dölj automatiskt</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Dölj automatiskt</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Dölj</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Fönsterposition</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Docka</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Docka som tabbat dokument</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Koppla loss</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Stäng</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Stäng</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Stäng alla andra</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Fönsterposition</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Docka som tabbat dokument</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Koppla loss</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Flytta till nästa tabgrupp</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Flytta till föregående tabgrupp</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Ny horisontell tabgrupp</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Ny vertikal tabgrupp</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Maximera</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Återställ</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
new file mode 100644
index 000000000..531d215da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
@@ -0,0 +1,16 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx
new file mode 100644
index 000000000..0ecbde1d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.resx
@@ -0,0 +1,159 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<!-- 
+		Microsoft ResX Schema
+
+		Version 1.3
+
+		The primary goals of this format is to allow a simple XML format 
+		that is mostly human readable. The generation and parsing of the 
+		various data types are done through the TypeConverter classes 
+		associated with the data types.
+
+		Example:
+
+		... ado.net/XML headers & schema ...
+		<resheader name="resmimetype">text/microsoft-resx</resheader>
+		<resheader name="version">1.3</resheader>
+		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+		<data name="Name1">this is my long string</data>
+		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+			[base64 mime encoded serialized .NET Framework object]
+		</data>
+		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+			[base64 mime encoded string representing a byte array form of the .NET Framework object]
+		</data>
+
+		There are any number of "resheader" rows that contain simple 
+		name/value pairs.
+
+		Each data row contains a name, and value. The row also contains a 
+		type or mimetype. Type corresponds to a .NET class that support 
+		text/value conversion through the TypeConverter architecture. 
+		Classes that don't support this are serialized and stored with the 
+		mimetype set.
+
+		The mimetype is used for serialized objects, and tells the 
+		ResXResourceReader how to depersist the object. This is currently not 
+		extensible. For a given mimetype the value must be set accordingly:
+
+		Note - application/x-microsoft.net.object.binary.base64 is the format 
+		that the ResXResourceWriter will generate, however the reader can 
+		read any of the formats listed below.
+
+		mimetype: application/x-microsoft.net.object.binary.base64
+		value   : The object must be serialized with 
+			: System.Serialization.Formatters.Binary.BinaryFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.soap.base64
+		value   : The object must be serialized with 
+			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+			: and then encoded with base64 encoding.
+
+		mimetype: application/x-microsoft.net.object.bytearray.base64
+		value   : The object must be serialized into a byte array 
+			: using a System.ComponentModel.TypeConverter
+			: and then encoded with base64 encoding.
+	-->
+	
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>自动隐藏</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>自动隐藏</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>隐藏</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>窗口位置</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>停靠</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>停靠成标签式文档</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>漂浮</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>关闭</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>关闭</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>留此，关闭其他</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>窗口位置</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>停靠成标签式文档</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>漂浮</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>移到下一标签组</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>移到上一标签组</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>新建水平标签组</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>新建垂直标签组</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>最大化</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>恢复</value>
+  </data>
+
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG
new file mode 100644
index 000000000..cdc7c06eb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockBottom.PNG differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG
new file mode 100644
index 000000000..88a086b01
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockLeft.PNG differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG
new file mode 100644
index 000000000..0377b966e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPane.PNG differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png
new file mode 100644
index 000000000..c3be3218b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockPaneEmpty.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG
new file mode 100644
index 000000000..067b3f063
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockRight.PNG differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG
new file mode 100644
index 000000000..b14b818c7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/DockTop.PNG differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png
new file mode 100644
index 000000000..4c50d26d3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/HTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png
new file mode 100644
index 000000000..a682de728
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png
new file mode 100644
index 000000000..705a49009
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png
new file mode 100644
index 000000000..c08f50f13
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png
new file mode 100644
index 000000000..14197efd7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockDocPaneTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png
new file mode 100644
index 000000000..01be445a9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneBottom.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png
new file mode 100644
index 000000000..a0b30b0e2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneInside.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png
new file mode 100644
index 000000000..21dfb7b0e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneLeft.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png
new file mode 100644
index 000000000..52438d8e2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneRight.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png
new file mode 100644
index 000000000..852a56b83
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/InnerDockPaneTop.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png
new file mode 100644
index 000000000..b8f6ced2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/Locked.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png
new file mode 100644
index 000000000..7a968a25e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinAutoHide.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png
new file mode 100644
index 000000000..1bd384e11
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinClose.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png
new file mode 100644
index 000000000..35b3fef68
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinDocMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png
new file mode 100644
index 000000000..19139428e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMaximize.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png
new file mode 100644
index 000000000..ebad71bee
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinMenu.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png
new file mode 100644
index 000000000..c95bb9364
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/PinRestore.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png
new file mode 100644
index 000000000..c3f279f7d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Generic/Images/VTabGroup.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
new file mode 100644
index 000000000..cdcb007ed
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+  public class GenericTheme : Theme
+  {
+    public override Uri GetResourceUri()
+    {
+      return new Uri(
+          "/Xceed.Wpf.AvalonDock;component/Themes/generic.xaml",
+          UriKind.Relative );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
new file mode 100644
index 000000000..dabd93c25
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
@@ -0,0 +1,36 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock.Themes
+{
+    public abstract class Theme : DependencyObject
+    {
+        public Theme()
+        {
+
+        }
+
+        public abstract Uri GetResourceUri();
+
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
new file mode 100644
index 000000000..0c87ada57
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
@@ -0,0 +1,973 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
+                    xmlns:avalonDock="clr-namespace:Xceed.Wpf.AvalonDock"
+                    xmlns:avalonDockLayout="clr-namespace:Xceed.Wpf.AvalonDock.Layout"
+                    xmlns:avalonDockControls="clr-namespace:Xceed.Wpf.AvalonDock.Controls"
+                    xmlns:avalonDockConverters="clr-namespace:Xceed.Wpf.AvalonDock.Converters"
+                    xmlns:avalonDockProperties="clr-namespace:Xceed.Wpf.AvalonDock.Properties"
+                    >
+
+    <avalonDockConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
+    <avalonDockConverters:InverseBoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter"/>
+    <avalonDockConverters:AnchorSideToOrientationConverter x:Key="AnchorSideToOrientationConverter"/>
+    <avalonDockConverters:AnchorSideToAngleConverter x:Key="AnchorSideToAngleConverter"/>
+    <avalonDockConverters:NullToDoNothingConverter x:Key="NullToDoNothingConverter"/>
+    <avalonDockConverters:LayoutItemFromLayoutModelConverter x:Key="LayoutItemFromLayoutModelConverter"/>
+    <avalonDockConverters:ActivateCommandLayoutItemFromLayoutModelConverter x:Key="ActivateCommandLayoutItemFromLayoutModelConverter"/>
+
+    <!--DocumentPaneControlStyle-->
+    <Style x:Key="DocumentPaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentPaneControl}">
+                    <Grid ClipToBounds="true" SnapsToDevicePixels="true" KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto"/>
+                            <RowDefinition Height="*"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Grid  Panel.ZIndex="1">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DocumentPaneTabPanel x:Name="HeaderPanel" Grid.Column="0" IsItemsHost="true" Margin="2,2,2,0" Grid.Row="0" KeyboardNavigation.TabIndex="1"/>
+                            <avalonDockControls:DropDownButton
+                                x:Name="MenuDropDownButton"
+                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                Focusable="False"
+                                Grid.Column="1">
+                                <avalonDockControls:DropDownButton.DropDownContextMenu>
+                                    <avalonDockControls:ContextMenuEx
+                                        ItemsSource="{Binding Model.ChildrenSorted, RelativeSource={RelativeSource TemplatedParent}}">
+                                        <avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                            <Style TargetType="{x:Type avalonDockControls:MenuItemEx}" BasedOn="{StaticResource {x:Type MenuItem}}">
+                                                <Setter Property="HeaderTemplate" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplate}"/>
+                                                <Setter Property="HeaderTemplateSelector" Value="{Binding Path=Root.Manager.DocumentPaneMenuItemHeaderTemplateSelector}"/>
+                                                <Setter Property="IconTemplate" Value="{Binding Path=Root.Manager.IconContentTemplate}"/>
+                                                <Setter Property="IconTemplateSelector" Value="{Binding Path=Root.Manager.IconContentTemplateSelector}"/>
+                                                <Setter Property="Command" Value="{Binding Path=., Converter={StaticResource ActivateCommandLayoutItemFromLayoutModelConverter}}"/>
+                                            </Style>
+                                        </avalonDockControls:ContextMenuEx.ItemContainerStyle>
+                                    </avalonDockControls:ContextMenuEx>
+                                </avalonDockControls:DropDownButton.DropDownContextMenu>
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinDocMenu.png"/>
+                            </avalonDockControls:DropDownButton>                            
+                        </Grid>
+                        <Border x:Name="ContentPanel" 
+                                VerticalAlignment="Stretch" 
+                                HorizontalAlignment="Stretch"  
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}" 
+                                Grid.Column="0" 
+                                KeyboardNavigation.DirectionalNavigation="Contained" 
+                                Grid.Row="1"
+                                KeyboardNavigation.TabIndex="2" 
+                                KeyboardNavigation.TabNavigation="Cycle">
+                            <ContentPresenter x:Name="PART_SelectedContentHost" 
+                                              ContentSource="SelectedContent" 
+                                              Margin="{TemplateBinding Padding}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <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 Property="Visibility" Value="Collapsed" TargetName="MenuDropDownButton" />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource BoolToVisibilityConverter}}"/>
+                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentTabItem Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutDocumentControl Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--AnchorablePaneControlStyle-->
+    <Style x:Key="AnchorablePaneControlStyle" TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+        <Setter Property="TabStripPlacement" Value="Bottom"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorablePaneControl}">
+                    <Grid ClipToBounds="true" 
+                          SnapsToDevicePixels="true" 
+                          KeyboardNavigation.TabNavigation="Local"
+                          >
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*"/>
+                            <RowDefinition Height="Auto"/>
+                        </Grid.RowDefinitions>
+                        <!--Following border is required to catch mouse events-->
+                        <Border Background="Transparent" Grid.RowSpan="2"/>
+                        <Border x:Name="ContentPanel" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Background="{TemplateBinding Background}"
+                                Grid.Column="0" 
+                                KeyboardNavigation.DirectionalNavigation="Contained" 
+                                Grid.Row="0" 
+                                KeyboardNavigation.TabIndex="2"
+                                KeyboardNavigation.TabNavigation="Cycle">
+                            <ContentPresenter x:Name="PART_SelectedContentHost"
+                                              ContentSource="SelectedContent" 
+                                              Margin="{TemplateBinding Padding}"
+                                              SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+                        </Border>
+                        <avalonDockControls:AnchorablePaneTabPanel x:Name="HeaderPanel" Margin="2,0,2,2" IsItemsHost="true" Grid.Row="1" KeyboardNavigation.TabIndex="1" Panel.ZIndex="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>
+
+        <Setter Property="ItemContainerStyle">
+            <Setter.Value>
+                <Style TargetType="{x:Type TabItem}">
+                    <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay}"/>
+                    <Setter Property="ToolTip" Value="{Binding ToolTip}"/>
+                    <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="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <avalonDockControls:LayoutAnchorableControl Model="{Binding}"/>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="avalonDockControls:AnchorablePaneTitle">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate>
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+                            <avalonDockControls:DropDownControlArea 
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                >
+                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding Model.Root.Manager.AnchorableTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                              ContentTemplateSelector="{Binding Model.Root.Manager.AnchorableTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </avalonDockControls:DropDownControlArea>
+
+                            <avalonDockControls:DropDownButton
+                                Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                Focusable="False"
+                                Grid.Column="1"
+                                DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                DropDownContextMenuDataContext="{Binding Path=LayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}"
+                                >
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png"/>
+                            </avalonDockControls:DropDownButton>
+
+                            <Button x:Name="PART_AutoHidePin" 
+                                Grid.Column="2" 
+                                Focusable="False"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                Command="{Binding Path=LayoutItem.AutoHideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnAutoHide_Hint}">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinAutoHide.png"/>
+                            </Button>
+
+                            <Button x:Name="PART_HidePin" 
+                                Grid.Column="3" 
+                                Focusable="False"
+                                Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                Command="{Binding Path=LayoutItem.HideCommand, RelativeSource={RelativeSource TemplatedParent}}" 
+                                ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}">
+                                <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
+                            </Button>
+
+
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Model.IsAutoHidden, RelativeSource={RelativeSource Mode=Self}}" Value="True">
+                            <Setter Property="LayoutTransform" TargetName="PART_AutoHidePin">
+                                <Setter.Value>
+                                    <RotateTransform Angle="90"/>
+                                </Setter.Value>
+                            </Setter>
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="AnchorSideTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorSideControl}">
+        <ItemsControl ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}">
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="{Binding Path=Model.Side, RelativeSource={RelativeSource AncestorType={x:Type avalonDockControls:LayoutAnchorSideControl}, Mode=FindAncestor}, Converter={StaticResource AnchorSideToOrientationConverter}}"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AnchorGroupTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorGroupControl}">
+        <ItemsControl 
+            ItemsSource="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Children}" 
+            >
+            <ItemsControl.LayoutTransform>
+                <RotateTransform Angle="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Model.Parent.Side, Converter={StaticResource AnchorSideToAngleConverter}}"/>
+            </ItemsControl.LayoutTransform>
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <StackPanel Orientation="Horizontal"/>
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="AnchorTemplate" TargetType="{x:Type avalonDockControls:LayoutAnchorControl}">
+        <Border BorderThickness="1" 
+                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}"
+                Margin="2"
+                Padding="2">
+            <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>
+
+    <Style x:Key="{x:Type avalonDockControls:OverlayWindow}" TargetType="{x:Type avalonDockControls:OverlayWindow}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:OverlayWindow}">
+                    <Canvas x:Name="PART_DropTargetsContainer" Opacity="0.9">
+                        <Path x:Name="PART_PreviewBox" Fill="AliceBlue" StrokeThickness="2" Stroke="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        <Grid x:Name="PART_DockingManagerDropTargets" >
+                            <Image x:Name="PART_DockingManagerDropTargetLeft" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockLeft.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetRight" VerticalAlignment="Center" HorizontalAlignment="Right" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockRight.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetBottom" VerticalAlignment="Bottom" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockBottom.PNG" Stretch="None" />
+                            <Image x:Name="PART_DockingManagerDropTargetTop" VerticalAlignment="Top" HorizontalAlignment="Center" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockTop.PNG" Stretch="None"/>
+                        </Grid>
+                        <Grid x:Name="PART_AnchorablePaneDropTargets">
+                            <Grid Width="88" Height="88" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"  Stretch="Uniform"/>
+                                <Border Name="PART_AnchorablePaneDropTargetTop" Grid.Column="1" Grid.Row="0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneTop.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetRight" Grid.Column="2" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetBottom" Grid.Column="1" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetLeft" Grid.Column="0" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_AnchorablePaneDropTargetInto" Grid.Column="1" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"  Stretch="None"/>
+                                </Border>                                
+                            </Grid>
+                        </Grid>
+                        <Grid x:Name="PART_DocumentPaneDropTargets">
+                            <Grid Width="88" Height="88" VerticalAlignment="Center" HorizontalAlignment="Center">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                    <ColumnDefinition/>
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                    <RowDefinition/>
+                                </Grid.RowDefinitions>
+                                <Image Grid.ColumnSpan="3" Grid.RowSpan="3" Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/DockPaneEmpty.PNG"  Stretch="Uniform"/>
+                                <Border Name="PART_DocumentPaneDropTargetTop" Grid.Column="1" Grid.Row="0">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneTop.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetRight" Grid.Column="2" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneRight.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetBottom" Grid.Column="1" Grid.Row="2">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneBottom.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetLeft" Grid.Column="0" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockDocPaneLeft.png"  Stretch="None"/>
+                                </Border>
+                                <Border Name="PART_DocumentPaneDropTargetInto" Grid.Column="1" Grid.Row="1">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/InnerDockPaneInside.png"  Stretch="None"/>
+                                </Border>
+                            </Grid>
+                        </Grid>
+                    </Canvas>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="DocumentHeaderTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AnchorableHeaderTemplate">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto"/>
+                <ColumnDefinition/>
+            </Grid.ColumnDefinitions>
+            <Image x:Name="icon" Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+            <TextBlock x:Name="title" Margin="4,0,0,0" Text="{Binding Title}" TextTrimming="CharacterEllipsis" Grid.Column="1"/>
+        </Grid>
+        <DataTemplate.Triggers>
+            <DataTrigger Binding="{Binding IconSource}" Value="{x:Null}">
+                <Setter Property="Margin" Value="0" TargetName="title"/>
+            </DataTrigger>
+        </DataTemplate.Triggers>
+    </DataTemplate>
+
+    <DataTemplate x:Key="DocumentTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="AnchorableTitleTemplate">
+        <TextBlock Text="{Binding Title}" TextTrimming="CharacterEllipsis"/>
+    </DataTemplate>
+
+    <DataTemplate x:Key="IconContentTemplate">
+        <Image Source="{Binding IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="Uniform"/>
+    </DataTemplate>
+
+    <ContextMenu x:Key="AnchorableContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Dock}" 
+                Command="{Binding Path=DockCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_AutoHide}" 
+                Command="{Binding Path=AutoHideCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Anchorable_Hide}" 
+                Command="{Binding Path=CloseCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <ContextMenu x:Key="DocumentContextMenu">
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Close}" 
+                  Command="{Binding Path=CloseCommand}"
+                  Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_CloseAllButThis}" 
+                Command="{Binding Path=CloseAllButThisCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_Float}" 
+                Command="{Binding Path=FloatCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_DockAsDocument}" 
+                Command="{Binding Path=DockAsDocumentCommand}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewHorizontalTabGroup}" 
+                Command="{Binding Path=NewHorizontalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_NewVerticalTabGroup}" 
+                Command="{Binding Path=NewVerticalTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToNextTabGroup}" 
+                Command="{Binding Path=MoveToNextTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+        <MenuItem Header="{x:Static avalonDockProperties:Resources.Document_MoveToPreviousTabGroup}" 
+                Command="{Binding Path=MoveToPreviousTabGroupCommand}"
+                Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"/>
+    </ContextMenu>
+
+    <!--DockingManager-->
+    <Style x:Key="{x:Type avalonDock:DockingManager}" TargetType="{x:Type avalonDock:DockingManager}">
+        <Setter Property="DocumentPaneControlStyle" Value="{StaticResource DocumentPaneControlStyle}"/>
+        <Setter Property="AnchorablePaneControlStyle" Value="{StaticResource AnchorablePaneControlStyle}"/>
+        <Setter Property="AnchorSideTemplate" Value="{StaticResource AnchorSideTemplate}"/>
+        <Setter Property="AnchorGroupTemplate" Value="{StaticResource AnchorGroupTemplate}"/>
+        <Setter Property="AnchorTemplate" Value="{StaticResource AnchorTemplate}"/>
+        <Setter Property="DocumentHeaderTemplate" Value="{StaticResource DocumentHeaderTemplate}"/>
+        <Setter Property="AnchorableHeaderTemplate" Value="{StaticResource AnchorableHeaderTemplate}"/>
+        <Setter Property="DocumentTitleTemplate" Value="{StaticResource DocumentTitleTemplate}"/>
+        <Setter Property="AnchorableTitleTemplate" Value="{StaticResource AnchorableTitleTemplate}"/>
+        <Setter Property="AnchorableContextMenu" Value="{StaticResource AnchorableContextMenu}"/>
+        <Setter Property="DocumentContextMenu" Value="{StaticResource DocumentContextMenu}"/>
+        <Setter Property="DocumentPaneMenuItemHeaderTemplate" Value="{StaticResource DocumentHeaderTemplate}"/>
+        <Setter Property="IconContentTemplate" Value="{StaticResource IconContentTemplate}"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDock:DockingManager}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                        <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 Content="{TemplateBinding LayoutRootPanel}" Grid.Column="1" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding RightSidePanel}" Grid.Column="2" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding LeftSidePanel}" Grid.Column="0" Grid.Row="1"/>
+                            <ContentPresenter Content="{TemplateBinding TopSidePanel}" Grid.Column="1" Grid.Row="0"/>
+                            <ContentPresenter Content="{TemplateBinding BottomSidePanel}" Grid.Column="1" Grid.Row="2"/>
+                            <ContentPresenter 
+                                x:Name="PART_AutoHideArea"
+                                Content="{TemplateBinding AutoHideWindow}"
+                                VerticalAlignment="{TemplateBinding VerticalAlignment}"
+                                HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                Grid.Column="1" Grid.Row="1"/> <!---->
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--LayoutGridResizerControl-->
+    <Style x:Key="{x:Type avalonDockControls:LayoutGridResizerControl}" TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutGridResizerControl}">
+                    <Border Background="{TemplateBinding Background}"/>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentControl}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <ContentPresenter Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <!--<ContentPresenter Content="{Binding Model.Content, RelativeSource={RelativeSource TemplatedParent}}" 
+                                          ContentTemplate="{Binding LayoutItemTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                          ContentTemplateSelector="{Binding LayoutItemTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>-->
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentTabItem}">
+                    <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.DocumentContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}" >
+                        <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*"/>
+                                    <ColumnDefinition Width="Auto"/>
+                                </Grid.ColumnDefinitions>
+                                <Border Grid.ColumnSpan="2" Background="Transparent"/>
+                                <ContentPresenter Content="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding DocumentHeaderTemplate, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"
+                                              ContentTemplateSelector="{Binding DocumentHeaderTemplateSelector, Mode=OneWay, RelativeSource={RelativeSource AncestorType={x:Type avalonDock:DockingManager}, Mode=FindAncestor}}"/>
+                                <!-- Close button should be moved out to the container style -->
+                                <Button x:Name="DocumentCloseButton" Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}" Grid.Column="1" Margin="5,0,0,0" Visibility="Hidden" 
+                                        Command="{Binding Path=LayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}">
+                                    <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
+                                </Button>
+                            </Grid>
+                        </Border>
+                    </avalonDockControls:DropDownControlArea>
+                    <ControlTemplate.Triggers>
+                        <DataTrigger Binding="{Binding Path=IsSelected}" Value="true">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="DocumentCloseButton"  />
+                        </Trigger>
+                        <DataTrigger Binding="{Binding Path=CanClose}" Value="false">
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="DocumentCloseButton"  />
+                        </DataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableTabItem}">
+                    <avalonDockControls:DropDownControlArea 
+                            DropDownContextMenu="{Binding Root.Manager.AnchorableContextMenu}"
+                            DropDownContextMenuDataContext="{Binding LayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                        <Border Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}">
+                            <Grid>
+                                <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 
+                                    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>
+
+    <Style TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableControl}">
+                    <Border Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            KeyboardNavigation.TabNavigation="Cycle">
+                        <Grid>
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="*"/>
+                            </Grid.RowDefinitions>
+                            <Border x:Name="Header">
+                                <avalonDockControls:AnchorablePaneTitle Model="{Binding Model, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            </Border>
+
+                            <ContentPresenter 
+                                Grid.Row="1"
+                                FlowDirection="{TemplateBinding FlowDirection}"
+                                Content="{Binding LayoutItem.View, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+                            <!--<ContentPresenter 
+                                FlowDirection="{TemplateBinding FlowDirection}"
+                                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>
+                        <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"/>
+                            </MultiDataTrigger.Conditions>
+                            <Setter Property="Visibility" Value="Collapsed" TargetName="Header"/>
+                        </MultiDataTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    CornerRadius="3,3,3,3"
+                    GlassFrameThickness="0"
+                    ShowSystemMenu="False"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutDocumentFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" BorderThickness="3" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                            <Grid Margin="3">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="16"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid>
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
+                                    <ContentPresenter Content="{Binding Model.RootDocument, RelativeSource={RelativeSource TemplatedParent}}" 
+                                              ContentTemplate="{Binding Model.Root.Manager.DocumentTitleTemplate, RelativeSource={RelativeSource TemplatedParent}}"
+                                              ContentTemplateSelector="{Binding Model.Root.Manager.DocumentTitleTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}"/>
+
+
+                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Focusable="False"
+                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                        Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                        Grid.Column="2">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png"/>
+                                    </Button>
+
+                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Focusable="False"
+                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                        Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                        Grid.Column="2">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png"/>
+                                    </Button>
+
+                                    <Button shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                            Focusable="False"
+                                            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                            Command="{Binding Path=RootDocumentLayoutItem.CloseCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                            ToolTip="{x:Static avalonDockProperties:Resources.Document_Close}"
+                                            Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                            Grid.Column="3">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
+                                    </Button>
+                                </Grid>
+                                <ContentPresenter Content="{TemplateBinding Content}" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+        <Setter Property="shell:WindowChrome.WindowChrome">
+            <Setter.Value>
+                <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    CornerRadius="3,3,3,3"
+                    GlassFrameThickness="0"
+                    ShowSystemMenu="True"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:LayoutAnchorableFloatingWindowControl}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" BorderThickness="3" Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                            <Grid Margin="3">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="16"/>
+                                    <RowDefinition Height="*"/>
+                                </Grid.RowDefinitions>
+                                <Grid>
+                                    <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={StaticResource BoolToVisibilityConverter}}">
+                                        <avalonDockControls:DropDownControlArea 
+                                            DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                            DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}">
+                                            <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
+                                        x:Name="SinglePaneContextMenu"
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Visibility="{Binding Path=Model.IsSinglePane, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Style="{StaticResource {x:Static ToolBar.ToggleButtonStyleKey}}"
+                                        Focusable="False"
+                                        Grid.Column="1"
+                                        DropDownContextMenu="{Binding Model.Root.Manager.AnchorableContextMenu, RelativeSource={RelativeSource TemplatedParent}}"
+                                        DropDownContextMenuDataContext="{Binding Path=SingleContentLayoutItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_CxMenu_Hint}">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMenu.png"/>
+                                    </avalonDockControls:DropDownButton>
+
+                                    <Button 
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Focusable="False"
+                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolToVisibilityConverter}}"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                        Command="{x:Static shell:SystemCommands.MaximizeWindowCommand}"
+                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Maximize}"
+                                        Grid.Column="2">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinMaximize.png"/>
+                                    </Button>
+
+                                    <Button 
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Focusable="False"
+                                        Visibility="{Binding IsMaximized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                        Command="{x:Static shell:SystemCommands.RestoreWindowCommand}"
+                                        CommandParameter="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Window_Restore}"
+                                        Grid.Column="2">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinRestore.png"/>
+                                    </Button>
+
+                                    <Button 
+                                        shell:WindowChrome.IsHitTestVisibleInChrome="True"
+                                        Focusable="False"
+                                        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+                                        Command="{Binding HideWindowCommand, RelativeSource={RelativeSource TemplatedParent}}"
+                                        ToolTip="{x:Static avalonDockProperties:Resources.Anchorable_BtnClose_Hint}"
+                                        Visibility="{Binding Path=IsEnabled, RelativeSource={RelativeSource Self}, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
+                                        Grid.Column="3">
+                                        <Image Source="/Xceed.Wpf.AvalonDock;component/Themes/Generic/Images/PinClose.png"/>
+                                    </Button>
+                                </Grid>
+                                <ContentPresenter
+                                    Content="{TemplateBinding Content}" Grid.Row="1"/>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Maximized">
+                            <Setter Property="Padding" Value="3" TargetName="WindowBorder"/>
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocused" Value="True">
+                            <Setter TargetName="WindowBorder"  Property="BorderBrush" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="{x:Type avalonDockControls:LayoutAutoHideWindowControl}" TargetType="{x:Type avalonDockControls:LayoutAutoHideWindowControl}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+    </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">
+            <Setter.Value>
+                <shell:WindowChrome
+                    ResizeBorderThickness="10"
+                    CaptionHeight="16"
+                    CornerRadius="3,3,3,3"
+                    GlassFrameThickness="4"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
+                    <Grid>
+                        <Border x:Name="WindowBorder" BorderThickness="3"
+                                Background="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"
+                                BorderBrush="{DynamicResource {x:Static SystemColors.ControlDarkBrushKey}}">
+                            <Grid Margin="5">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="54"/>
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="42"/>
+                                </Grid.RowDefinitions>
+
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition/>
+                                    </Grid.RowDefinitions>
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto"/>
+                                            <ColumnDefinition/>
+                                        </Grid.ColumnDefinitions>
+                                        <Image Source="{Binding SelectedDocument.LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                        <TextBlock Text="{Binding SelectedDocument.LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" VerticalAlignment="Center" FontWeight="Bold" Margin="4,0,0,0"/>
+                                    </Grid>
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.Description}" TextTrimming="CharacterEllipsis" VerticalAlignment="Center"/>
+                                </Grid>
+
+                                <Grid Grid.Row="1">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition/>
+                                    </Grid.ColumnDefinitions>
+                                    <Grid Margin="5">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Text="Active Tool Windows" FontWeight="Bold" Margin="0,3,0,4"/>
+                                        <ListBox Grid.Row="1" ItemsSource="{Binding Anchorables}" SelectedItem="{Binding SelectedAnchorable, Mode=TwoWay}" Background="Transparent" BorderThickness="0" MaxHeight="400" FocusVisualStyle="{x:Null}">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem">
+                                                    <Setter Property="Cursor" Value="Hand"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                        <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,2,0,2"/>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                        </ListBox>
+                                    </Grid>
+                                    <Grid Grid.Column="1" Margin="5">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto"/>
+                                            <RowDefinition/>
+                                        </Grid.RowDefinitions>
+                                        <TextBlock Text="Active Files" FontWeight="Bold" Margin="0,3,0,4"/>
+                                        <ListBox Grid.Row="1" ItemsSource="{Binding Documents}" SelectedItem="{Binding SelectedDocument, Mode=TwoWay}" Background="Transparent" BorderThickness="0" MaxHeight="400" FocusVisualStyle="{x:Null}">
+                                            <ListBox.ItemContainerStyle>
+                                                <Style TargetType="ListBoxItem">
+                                                    <Setter Property="Cursor" Value="Hand"/>
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                                                            <Setter Property="TextElement.Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+                                                        </Trigger>     
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </ListBox.ItemContainerStyle>
+                                            <ListBox.ItemTemplate>
+                                                <DataTemplate>
+                                                    <Grid>
+                                                        <Grid.ColumnDefinitions>
+                                                            <ColumnDefinition Width="Auto"/>
+                                                            <ColumnDefinition/>
+                                                        </Grid.ColumnDefinitions>
+                                                        <Image Source="{Binding LayoutElement.IconSource, Converter={StaticResource NullToDoNothingConverter}}" Stretch="None"/>
+                                                        <TextBlock Text="{Binding LayoutElement.Title}" TextTrimming="CharacterEllipsis" Grid.Column="1" Margin="4,2,0,2"/>
+                                                    </Grid>
+                                                </DataTemplate>
+                                            </ListBox.ItemTemplate>
+                                            <ListBox.ItemsPanel>
+                                                <ItemsPanelTemplate>
+                                                    <WrapPanel Orientation="Vertical"/>
+                                                </ItemsPanelTemplate>
+                                            </ListBox.ItemsPanel>
+                                        </ListBox>
+                                    </Grid>
+                                </Grid>
+
+                                <Grid Grid.Row="2">
+                                    <TextBlock Text="{Binding SelectedDocument.LayoutElement.ToolTip}" VerticalAlignment="Center"/>
+                                </Grid>
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
new file mode 100644
index 000000000..c9a8e19cb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
@@ -0,0 +1,460 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    internal static class Win32Helper
+    {
+        [DllImport("user32.dll", EntryPoint = "CreateWindowEx", CharSet = CharSet.Unicode)]
+        internal static extern IntPtr CreateWindowEx(int dwExStyle,
+                                                      string lpszClassName,
+                                                      string lpszWindowName,
+                                                      int style,
+                                                      int x, int y,
+                                                      int width, int height,
+                                                      IntPtr hwndParent,
+                                                      IntPtr hMenu,
+                                                      IntPtr hInst,
+                                                      [MarshalAs(UnmanagedType.AsAny)] object pvParam);
+        internal const int
+              WS_CHILD = 0x40000000,
+              WS_VISIBLE = 0x10000000,
+              WS_VSCROLL = 0x00200000,
+              WS_BORDER = 0x00800000,
+              WS_CLIPSIBLINGS = 0x04000000,
+              WS_CLIPCHILDREN = 0x02000000,
+              WS_TABSTOP = 0x00010000,
+              WS_GROUP = 0x00020000;
+
+
+        /// <summary>
+        /// SetWindowPos Flags
+        /// </summary>
+        [Flags()]
+        internal enum SetWindowPosFlags : uint
+        {
+            /// <summary>If the calling thread and the thread that owns the window are attached to different input queues,
+            /// the system posts the request to the thread that owns the window. This prevents the calling thread from
+            /// blocking its execution while other threads process the request.</summary>
+            /// <remarks>SWP_ASYNCWINDOWPOS</remarks>
+            SynchronousWindowPosition = 0x4000,
+            /// <summary>Prevents generation of the WM_SYNCPAINT message.</summary>
+            /// <remarks>SWP_DEFERERASE</remarks>
+            DeferErase = 0x2000,
+            /// <summary>Draws a frame (defined in the window's class description) around the window.</summary>
+            /// <remarks>SWP_DRAWFRAME</remarks>
+            DrawFrame = 0x0020,
+            /// <summary>Applies new frame styles set using the SetWindowLong function. Sends a WM_NCCALCSIZE message to
+            /// the window, even if the window's size is not being changed. If this flag is not specified, WM_NCCALCSIZE
+            /// is sent only when the window's size is being changed.</summary>
+            /// <remarks>SWP_FRAMECHANGED</remarks>
+            FrameChanged = 0x0020,
+            /// <summary>Hides the window.</summary>
+            /// <remarks>SWP_HIDEWINDOW</remarks>
+            HideWindow = 0x0080,
+            /// <summary>Does not activate the window. If this flag is not set, the window is activated and moved to the
+            /// top of either the topmost or non-topmost group (depending on the setting of the hWndInsertAfter
+            /// parameter).</summary>
+            /// <remarks>SWP_NOACTIVATE</remarks>
+            DoNotActivate = 0x0010,
+            /// <summary>Discards the entire contents of the client area. If this flag is not specified, the valid
+            /// contents of the client area are saved and copied back into the client area after the window is sized or
+            /// repositioned.</summary>
+            /// <remarks>SWP_NOCOPYBITS</remarks>
+            DoNotCopyBits = 0x0100,
+            /// <summary>Retains the current position (ignores X and Y parameters).</summary>
+            /// <remarks>SWP_NOMOVE</remarks>
+            IgnoreMove = 0x0002,
+            /// <summary>Does not change the owner window's position in the Z order.</summary>
+            /// <remarks>SWP_NOOWNERZORDER</remarks>
+            DoNotChangeOwnerZOrder = 0x0200,
+            /// <summary>Does not redraw changes. If this flag is set, no repainting of any kind occurs. This applies to
+            /// the client area, the nonclient area (including the title bar and scroll bars), and any part of the parent
+            /// window uncovered as a result of the window being moved. When this flag is set, the application must
+            /// explicitly invalidate or redraw any parts of the window and parent window that need redrawing.</summary>
+            /// <remarks>SWP_NOREDRAW</remarks>
+            DoNotRedraw = 0x0008,
+            /// <summary>Same as the SWP_NOOWNERZORDER flag.</summary>
+            /// <remarks>SWP_NOREPOSITION</remarks>
+            DoNotReposition = 0x0200,
+            /// <summary>Prevents the window from receiving the WM_WINDOWPOSCHANGING message.</summary>
+            /// <remarks>SWP_NOSENDCHANGING</remarks>
+            DoNotSendChangingEvent = 0x0400,
+            /// <summary>Retains the current size (ignores the cx and cy parameters).</summary>
+            /// <remarks>SWP_NOSIZE</remarks>
+            IgnoreResize = 0x0001,
+            /// <summary>Retains the current Z order (ignores the hWndInsertAfter parameter).</summary>
+            /// <remarks>SWP_NOZORDER</remarks>
+            IgnoreZOrder = 0x0004,
+            /// <summary>Displays the window.</summary>
+            /// <remarks>SWP_SHOWWINDOW</remarks>
+            ShowWindow = 0x0040,
+        }
+
+        /// <summary>
+        ///     Special window handles
+        /// </summary>
+        internal static readonly IntPtr HWND_TOPMOST = new IntPtr(-1);
+        internal static readonly IntPtr HWND_NOTOPMOST = new IntPtr(-2);
+        internal static readonly IntPtr HWND_TOP = new IntPtr(0);
+        internal static readonly IntPtr HWND_BOTTOM = new IntPtr(1);
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal class WINDOWPOS
+        {
+            public IntPtr hwnd;
+            public IntPtr hwndInsertAfter;
+            public int x;
+            public int y;
+            public int cx;
+            public int cy;
+            public int flags;
+        }; 
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool SetWindowPos(IntPtr hWnd, IntPtr hWndInsertAfter, int X, int Y, int cx, int cy, SetWindowPosFlags uFlags);
+
+        [DllImport("user32.dll", CharSet = CharSet.Auto, ExactSpelling = true)]
+        internal static extern bool IsChild(IntPtr hWndParent, IntPtr hwnd);
+
+        [DllImport("user32.dll")]
+        internal static extern IntPtr SetFocus(IntPtr hWnd);
+
+        internal const int WM_WINDOWPOSCHANGED = 0x0047;
+        internal const int WM_WINDOWPOSCHANGING = 0x0046;
+        internal const int WM_NCMOUSEMOVE = 0xa0;
+        internal const int WM_NCLBUTTONDOWN = 0xA1;
+        internal const int WM_NCLBUTTONUP = 0xA2;
+        internal const int WM_NCLBUTTONDBLCLK = 0xA3;
+        internal const int WM_NCRBUTTONDOWN = 0xA4;
+        internal const int WM_NCRBUTTONUP = 0xA5;
+        internal const int WM_CAPTURECHANGED = 0x0215;
+        internal const int WM_EXITSIZEMOVE = 0x0232;
+        internal const int WM_ENTERSIZEMOVE = 0x0231;
+        internal const int WM_MOVE = 0x0003;
+        internal const int WM_MOVING = 0x0216;
+        internal const int WM_KILLFOCUS = 0x0008;
+        internal const int WM_SETFOCUS = 0x0007;
+        internal const int WM_ACTIVATE = 0x0006;
+        internal const int WM_NCHITTEST = 0x0084;
+        internal const int WM_INITMENUPOPUP = 0x0117;
+        internal const int WM_KEYDOWN = 0x0100;
+        internal const int WM_KEYUP = 0x0101;
+
+        internal const int WA_INACTIVE = 0x0000;
+
+        internal const int
+            WM_CREATE = 0x0001;
+
+        [DllImport("user32.dll", SetLastError = true)]
+        public static extern IntPtr SetActiveWindow(IntPtr hWnd);
+
+        [DllImport("user32.dll", EntryPoint = "DestroyWindow", CharSet = CharSet.Unicode)]
+        internal static extern bool DestroyWindow(IntPtr hwnd);
+
+        internal const int HT_CAPTION = 0x2;
+
+        [DllImportAttribute("user32.dll")]
+        internal static extern int SendMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+        [DllImportAttribute("user32.dll")]
+        internal static extern int PostMessage(IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+
+        [DllImport("user32.dll")]
+        static extern bool GetClientRect(IntPtr hWnd, out RECT lpRect);
+        [DllImport("user32.dll")]
+        internal static extern bool GetWindowRect(IntPtr hWnd, out RECT lpRect);
+
+        // Hook Types  
+        public enum HookType : int
+        {
+            WH_JOURNALRECORD = 0,
+            WH_JOURNALPLAYBACK = 1,
+            WH_KEYBOARD = 2,
+            WH_GETMESSAGE = 3,
+            WH_CALLWNDPROC = 4,
+            WH_CBT = 5,
+            WH_SYSMSGFILTER = 6,
+            WH_MOUSE = 7,
+            WH_HARDWARE = 8,
+            WH_DEBUG = 9,
+            WH_SHELL = 10,
+            WH_FOREGROUNDIDLE = 11,
+            WH_CALLWNDPROCRET = 12,
+            WH_KEYBOARD_LL = 13,
+            WH_MOUSE_LL = 14
+        }
+
+        public const int HCBT_SETFOCUS = 9;
+        public const int HCBT_ACTIVATE = 5;
+
+        [DllImport("kernel32.dll")]
+        public static extern uint GetCurrentThreadId();
+
+        public delegate int HookProc(int code, IntPtr wParam,
+           IntPtr lParam);
+
+        [DllImport("user32.dll")]
+        public static extern IntPtr SetWindowsHookEx(HookType code,
+            HookProc func,
+            IntPtr hInstance,
+            int threadID);
+        [DllImport("user32.dll")]
+        public static extern int UnhookWindowsHookEx(IntPtr hhook);
+        [DllImport("user32.dll")]
+        public static extern int CallNextHookEx(IntPtr hhook,
+            int code, IntPtr wParam, IntPtr lParam);
+
+        [Serializable, StructLayout(LayoutKind.Sequential)]
+        internal struct RECT
+        {
+            public int Left;
+            public int Top; 
+            public int Right; 
+            public int Bottom;
+            public RECT(int left_, int top_, int right_, int bottom_)
+            {
+                Left = left_; Top = top_; Right = right_; Bottom = bottom_;
+            }
+
+            public int Height
+            {
+                get { return Bottom - Top; }
+            }
+
+            public int Width
+            {
+                get { return Right - Left; }
+            }
+            public Size Size { get { return new Size(Width, Height); } }  
+            public Point Location { get { return new Point(Left, Top); } }
+            // Handy method for converting to a System.Drawing.Rectangle  
+            public Rect ToRectangle() { return new Rect(Left, Top, Right, Bottom); } 
+            public static RECT FromRectangle(Rect rectangle)
+            { return new Rect(rectangle.Left, rectangle.Top, rectangle.Right, rectangle.Bottom); }   
+            public override int GetHashCode()
+            { return Left ^ ((Top << 13) | (Top >> 0x13)) ^ ((Width << 0x1a) | (Width >> 6)) ^ ((Height << 7) | (Height >> 0x19)); }
+
+            #region Operator overloads
+            public static implicit operator Rect(RECT rect) { return rect.ToRectangle(); }   public static implicit operator RECT(Rect rect) { return FromRectangle(rect); }
+            #endregion
+        }
+
+        internal static RECT GetClientRect(IntPtr hWnd)
+        {
+            RECT result = new RECT();
+            GetClientRect(hWnd, out result);
+            return result;
+        }
+        internal static RECT GetWindowRect(IntPtr hWnd)
+        {
+            RECT result = new RECT();
+            GetWindowRect(hWnd, out result);
+            return result;
+        }
+
+        [DllImport("user32.dll")]
+        internal static extern IntPtr GetTopWindow(IntPtr hWnd);
+
+        internal const uint GW_HWNDNEXT = 2;
+        internal const uint GW_HWNDPREV = 3;
+
+
+        [DllImport("user32.dll", SetLastError = true)]
+        internal static extern IntPtr GetWindow(IntPtr hWnd, uint uCmd);
+
+        internal enum GetWindow_Cmd : uint
+        {
+            GW_HWNDFIRST = 0,
+            GW_HWNDLAST = 1,
+            GW_HWNDNEXT = 2,
+            GW_HWNDPREV = 3,
+            GW_OWNER = 4,
+            GW_CHILD = 5,
+            GW_ENABLEDPOPUP = 6
+        } 
+
+        internal static int MakeLParam(int LoWord, int HiWord)
+        {
+
+          //System.Diagnostics.Trace.WriteLine("LoWord: " + LoWord2(((HiWord << 16) |
+         //(LoWord & 0xffff))));
+
+            return (int) ((HiWord << 16) | (LoWord & 0xffff));
+        }
+
+
+        internal const int WM_MOUSEMOVE = 0x200;
+        internal const int WM_LBUTTONDOWN = 0x201;
+        internal const int WM_LBUTTONUP = 0x202;
+        internal const int WM_LBUTTONDBLCLK = 0x203;
+        internal const int WM_RBUTTONDOWN = 0x204;
+        internal const int WM_RBUTTONUP = 0x205;
+        internal const int WM_RBUTTONDBLCLK = 0x206;
+        internal const int WM_MBUTTONDOWN = 0x207;
+        internal const int WM_MBUTTONUP = 0x208;
+        internal const int WM_MBUTTONDBLCLK = 0x209;
+        internal const int WM_MOUSEWHEEL = 0x20A;
+        internal const int WM_MOUSEHWHEEL = 0x20E;
+
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool GetCursorPos(ref Win32Point pt);
+
+        [StructLayout(LayoutKind.Sequential)]
+        internal struct Win32Point
+        {
+            public Int32 X;
+            public Int32 Y;
+        };
+        internal static Point GetMousePosition()
+        {
+            Win32Point w32Mouse = new Win32Point();
+            GetCursorPos(ref w32Mouse);
+            return new Point(w32Mouse.X, w32Mouse.Y);
+        }
+
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IsWindowVisible(IntPtr hWnd);
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool IsWindowEnabled(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        internal static extern IntPtr GetFocus();
+
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        internal static extern bool BringWindowToTop(IntPtr hWnd);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        internal static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
+
+        [DllImport("user32.dll", ExactSpelling = true, CharSet = CharSet.Auto)]
+        internal static extern IntPtr GetParent(IntPtr hWnd);
+
+        /// <summary>
+        /// Changes an attribute of the specified window. The function also sets the 32-bit (long) value at the specified offset into the extra window memory.
+        /// </summary>
+        /// <param name="hWnd">A handle to the window and, indirectly, the class to which the window belongs..</param>
+        /// <param name="nIndex">The zero-based offset to the value to be set. Valid values are in the range zero through the number of bytes of extra window memory, minus the size of an integer. To set any other value, specify one of the following values: GWL_EXSTYLE, GWL_HINSTANCE, GWL_ID, GWL_STYLE, GWL_USERDATA, GWL_WNDPROC </param>
+        /// <param name="dwNewLong">The replacement value.</param>
+        /// <returns>If the function succeeds, the return value is the previous value of the specified 32-bit integer.
+        /// If the function fails, the return value is zero. To get extended error information, call GetLastError. </returns>
+        [DllImport("user32.dll")]
+        static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
+        [DllImport("user32.dll", SetLastError = true)]
+        static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+        public static void SetOwner(IntPtr childHandle, IntPtr ownerHandle)
+        {
+            SetWindowLong(
+                childHandle,
+                -8, // GWL_HWNDPARENT
+                ownerHandle.ToInt32());
+        }
+
+        public static IntPtr GetOwner(IntPtr childHandle)
+        {
+            return new IntPtr(GetWindowLong(childHandle, -8));
+        }
+
+
+        //Monitor Patch #13440
+
+        /// <summary>
+        /// The MonitorFromRect function retrieves a handle to the display monitor that 
+        /// has the largest area of intersection with a specified rectangle.
+        /// </summary>
+        /// <param name="lprc">Pointer to a RECT structure that specifies the rectangle of interest in 
+        /// virtual-screen coordinates</param>
+        /// <param name="dwFlags">Determines the function's return value if the rectangle does not intersect 
+        /// any display monitor</param>
+        /// <returns>
+        /// If the rectangle intersects one or more display monitor rectangles, the return value 
+        /// is an HMONITOR handle to the display monitor that has the largest area of intersection with the rectangle.
+        /// If the rectangle does not intersect a display monitor, the return value depends on the value of dwFlags.
+        /// </returns>
+        [DllImport("user32.dll")]
+        public static extern IntPtr MonitorFromRect([In] ref RECT lprc, uint dwFlags);
+
+        /// <summary>
+        /// The MonitorFromWindow function retrieves a handle to the display monitor that has the largest area of intersection with the bounding rectangle of a specified window. 
+        /// </summary>
+        /// <param name="hwnd">A handle to the window of interest.</param>
+        /// <param name="dwFlags">Determines the function's return value if the window does not intersect any display monitor.</param>
+        /// <returns>If the window intersects one or more display monitor rectangles, the return value is an HMONITOR handle to the display monitor that has the largest area of intersection with the window. 
+        /// If the window does not intersect a display monitor, the return value depends on the value of dwFlags.
+        /// </returns>
+        [DllImport("user32.dll")]
+        public static extern IntPtr MonitorFromWindow(IntPtr hwnd, uint dwFlags);
+
+
+        /// <summary>
+        /// The MONITORINFO structure contains information about a display monitor.
+        /// </summary>
+        [StructLayout(LayoutKind.Sequential)]
+        public class MonitorInfo
+        {
+            /// <summary>
+            /// The size of the structure, in bytes. 
+            /// </summary>
+            public int Size = Marshal.SizeOf(typeof(MonitorInfo));
+            /// <summary>
+            /// A RECT structure that specifies the display monitor rectangle, expressed 
+            /// in virtual-screen coordinates. 
+            /// Note that if the monitor is not the primary display monitor, 
+            /// some of the rectangle's coordinates may be negative values. 
+            /// </summary>
+            public RECT Monitor;
+            /// <summary>
+            /// A RECT structure that specifies the work area rectangle of the display monitor, 
+            /// expressed in virtual-screen coordinates. Note that if the monitor is not the primary 
+            /// display monitor, some of the rectangle's coordinates may be negative values.
+            /// </summary>
+            public RECT Work;
+            /// <summary>
+            /// A set of flags that represent attributes of the display monitor. 
+            /// </summary>
+            public uint Flags;
+        }
+
+        /// <summary>
+        /// The GetMonitorInfo function retrieves information about a display monitor. 
+        /// </summary>
+        /// <param name="hMonitor">Handle to the display monitor of interest.</param>
+        /// <param name="lpmi">Pointer to a MONITORINFO or MONITORINFOEX structure that receives 
+        /// information about the specified display monitor</param>
+        /// <returns>If the function succeeds, the return value is nonzero.
+        /// If the function fails, the return value is zero.</returns>
+        [DllImport("user32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        public static extern bool GetMonitorInfo(IntPtr hMonitor, [In, Out] MonitorInfo lpmi);
+
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
new file mode 100644
index 000000000..91bb2d748
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
@@ -0,0 +1,80 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+using System.Windows;
+using System.Windows.Interop;
+
+namespace Xceed.Wpf.AvalonDock
+{
+    static class WindowHelper
+    {
+        public static bool IsAttachedToPresentationSource(this Visual element)
+        {
+            return PresentationSource.FromVisual(element as Visual) != null;
+        }
+
+        public static void SetParentToMainWindowOf(this Window window, Visual element)
+        {
+            var wndParent = Window.GetWindow(element);
+            if (wndParent != null)
+                window.Owner = wndParent;
+            else
+            {
+                IntPtr parentHwnd;
+                if (GetParentWindowHandle(element, out parentHwnd))
+                    Win32Helper.SetOwner(new WindowInteropHelper(window).Handle, parentHwnd);
+            }
+        }
+
+        public static IntPtr GetParentWindowHandle(this Window window)
+        {
+            if (window.Owner != null)
+                return new WindowInteropHelper(window.Owner).Handle;
+            else
+                return Win32Helper.GetOwner(new WindowInteropHelper(window).Handle);
+        }
+
+
+        public static bool GetParentWindowHandle(this Visual element, out IntPtr hwnd)
+        {
+            hwnd = IntPtr.Zero;
+            HwndSource wpfHandle = PresentationSource.FromVisual(element) as HwndSource;
+
+            if (wpfHandle == null)
+                return false;
+
+            hwnd = Win32Helper.GetParent(wpfHandle.Handle);
+            if (hwnd == IntPtr.Zero)
+                hwnd = wpfHandle.Handle;
+            return true;
+        }
+
+        public static void SetParentWindowToNull(this Window window)
+        {
+            if (window.Owner != null)
+                window.Owner = null;
+            else
+            {
+                Win32Helper.SetOwner(new WindowInteropHelper(window).Handle, IntPtr.Zero);
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
new file mode 100644
index 000000000..d45344fe1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
@@ -0,0 +1,361 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</ProjectGuid>
+    <OutputType>library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.AvalonDock</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>
+    </DocumentationFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <SignAssembly>false</SignAssembly>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="Commands\RelayCommand.cs" />
+    <Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
+    <Compile Include="Controls\AnchorablePaneDropTarget.cs" />
+    <Compile Include="Controls\AnchorablePaneTabPanel.cs" />
+    <Compile Include="Controls\AnchorablePaneTitle.cs" />
+    <Compile Include="Controls\AutoHideWindowManager.cs" />
+    <Compile Include="Controls\BindingHelper.cs" />
+    <Compile Include="Controls\ContextMenuEx.cs" />
+    <Compile Include="Controls\FullWeakDictionary.cs" />
+    <Compile Include="Controls\DocumentPaneDropAsAnchorableTarget.cs" />
+    <Compile Include="Controls\DocumentPaneGroupDropTarget.cs" />
+    <Compile Include="Controls\DropDownButton.cs" />
+    <Compile Include="Controls\DropDownControlArea.cs" />
+    <Compile Include="Controls\DropTargetBase.cs" />
+    <Compile Include="Controls\WeakDictionary.cs" />
+    <Compile Include="Controls\WindowActivateEventArgs.cs" />
+    <Compile Include="Controls\WindowHookHandler.cs" />
+    <Compile Include="Controls\FocusElementManager.cs" />
+    <Compile Include="Controls\LayoutAnchorableItem.cs" />
+    <Compile Include="Controls\LayoutDocumentItem.cs" />
+    <Compile Include="Controls\LayoutItem.cs" />
+    <Compile Include="Controls\MenuItemEx.cs" />
+    <Compile Include="Controls\NavigatorWindow.cs" />
+    <Compile Include="Controls\ReentrantFlag.cs" />
+    <Compile Include="Controls\Shell\Standard\ComGuids.cs" />
+    <Compile Include="Controls\Shell\Standard\Debug.cs" />
+    <Compile Include="Controls\Shell\Standard\DoubleUtil.cs" />
+    <Compile Include="Controls\Shell\Standard\DpiHelper.cs" />
+    <Compile Include="Controls\Shell\Standard\ErrorCodes.cs" />
+    <Compile Include="Controls\Shell\Standard\MessageWindow.cs" />
+    <Compile Include="Controls\Shell\Standard\NativeMethods.cs" />
+    <Compile Include="Controls\Shell\Standard\ShellProvider.cs" />
+    <Compile Include="Controls\Shell\Standard\StreamHelper.cs" />
+    <Compile Include="Controls\Shell\Standard\Utilities.cs" />
+    <Compile Include="Controls\Shell\Standard\Verify.cs" />
+    <Compile Include="Controls\Shell\SystemCommands.cs" />
+    <Compile Include="Controls\Shell\SystemParameters2.cs" />
+    <Compile Include="Controls\Shell\WindowChrome.cs" />
+    <Compile Include="Controls\Shell\WindowChromeWorker.cs" />
+    <Compile Include="Converters\ActivateCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\AutoHideCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\HideCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\InverseBoolToVisibilityConverter.cs" />
+    <Compile Include="Converters\LayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\NullToDoNothingConverter.cs" />
+    <Compile Include="Converters\UriSourceToBitmapImageConverter.cs" />
+    <Compile Include="DocumentClosedEventArgs.cs" />
+    <Compile Include="DocumentClosingEventArgs.cs" />
+    <Compile Include="Extentions.cs" />
+    <Compile Include="LayoutEventArgs.cs" />
+    <Compile Include="Layout\AnchorableShowStrategy.cs" />
+    <Compile Include="Layout\AnchorSide.cs" />
+    <Compile Include="Controls\DockingManagerDropTarget.cs" />
+    <Compile Include="Controls\DockingManagerOverlayArea.cs" />
+    <Compile Include="Controls\DocumentPaneControlOverlayArea.cs" />
+    <Compile Include="Controls\DocumentPaneDropTarget.cs" />
+    <Compile Include="Controls\DocumentPaneTabPanel.cs" />
+    <Compile Include="Controls\DragService.cs" />
+    <Compile Include="Controls\DropArea.cs" />
+    <Compile Include="Controls\DropTarget.cs" />
+    <Compile Include="Controls\DropTargetType.cs" />
+    <Compile Include="Controls\Extentions.cs" />
+    <Compile Include="Controls\IDropTarget.cs" />
+    <Compile Include="Controls\LayoutAnchorableControl.cs" />
+    <Compile Include="Controls\LayoutAnchorableFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutAnchorablePaneControl.cs" />
+    <Compile Include="Controls\LayoutAnchorablePaneGroupControl.cs" />
+    <Compile Include="Controls\LayoutAnchorableTabItem.cs" />
+    <Compile Include="Controls\LayoutAnchorControl.cs" />
+    <Compile Include="Controls\LayoutAnchorGroupControl.cs" />
+    <Compile Include="Controls\LayoutAnchorSideControl.cs" />
+    <Compile Include="Controls\LayoutDocumentControl.cs" />
+    <Compile Include="Controls\LayoutDocumentFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutDocumentPaneControl.cs" />
+    <Compile Include="Controls\LayoutDocumentPaneGroupControl.cs" />
+    <Compile Include="Controls\LayoutDocumentTabItem.cs" />
+    <Compile Include="Controls\LayoutFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutGridControl.cs" />
+    <Compile Include="Controls\LayoutGridResizerControl.cs" />
+    <Compile Include="Controls\LayoutPanelControl.cs" />
+    <Compile Include="Controls\OverlayArea.cs" />
+    <Compile Include="Controls\OverlayWindow.cs" />
+    <Compile Include="Controls\OverlayWindowDropTarget.cs" />
+    <Compile Include="Controls\OverlayWindowDropTargetType.cs" />
+    <Compile Include="Controls\TransformExtentions.cs" />
+    <Compile Include="Converters\AnchorSideToAngleConverter.cs" />
+    <Compile Include="Converters\AnchorSideToOrientationConverter.cs" />
+    <Compile Include="Converters\BoolToVisibilityConverter.cs" />
+    <Compile Include="DockingManager.cs" />
+    <Compile Include="Layout\ChildrenTreeChangedEventArgs.cs" />
+    <Compile Include="Layout\Extentions.cs" />
+    <Compile Include="Layout\ILayoutAnchorablePane.cs" />
+    <Compile Include="Layout\ILayoutContainer.cs" />
+    <Compile Include="Layout\ILayoutContentSelector.cs" />
+    <Compile Include="Layout\ILayoutControl.cs" />
+    <Compile Include="Layout\ILayoutDocumentPane.cs" />
+    <Compile Include="Layout\ILayoutElement.cs" />
+    <Compile Include="Layout\ILayoutElementWithVisibility.cs" />
+    <Compile Include="Layout\ILayoutGroup.cs" />
+    <Compile Include="Layout\ILayoutOrientableElement.cs" />
+    <Compile Include="Layout\ILayoutPane.cs" />
+    <Compile Include="Layout\ILayoutPanelElement.cs" />
+    <Compile Include="Layout\ILayoutPaneSerializable.cs" />
+    <Compile Include="Layout\ILayoutPositionableElement.cs" />
+    <Compile Include="Layout\ILayoutPreviousContainer.cs" />
+    <Compile Include="Layout\ILayoutRoot.cs" />
+    <Compile Include="Controls\IOverlayWindow.cs" />
+    <Compile Include="Controls\IOverlayWindowArea.cs" />
+    <Compile Include="Controls\IOverlayWindowDropTarget.cs" />
+    <Compile Include="Controls\IOverlayWindowHost.cs" />
+    <Compile Include="Layout\ILayoutUpdateStrategy.cs" />
+    <Compile Include="Layout\LayoutAnchorable.cs" />
+    <Compile Include="Layout\LayoutAnchorableFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutAnchorablePane.cs" />
+    <Compile Include="Layout\LayoutAnchorablePaneGroup.cs" />
+    <Compile Include="Layout\LayoutAnchorGroup.cs" />
+    <Compile Include="Layout\LayoutAnchorSide.cs" />
+    <Compile Include="Controls\LayoutAutoHideWindowControl.cs" />
+    <Compile Include="Layout\LayoutContent.cs" />
+    <Compile Include="Layout\LayoutDocument.cs" />
+    <Compile Include="Layout\LayoutDocumentFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutDocumentPane.cs" />
+    <Compile Include="Layout\LayoutDocumentPaneGroup.cs" />
+    <Compile Include="Layout\LayoutElement.cs" />
+    <Compile Include="Layout\LayoutElementEventArgs.cs" />
+    <Compile Include="Layout\LayoutFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutGroup.cs" />
+    <Compile Include="Layout\LayoutGroupBase.cs" />
+    <Compile Include="Layout\LayoutPanel.cs" />
+    <Compile Include="Layout\LayoutPositionableGroup.cs" />
+    <Compile Include="Layout\LayoutRoot.cs" />
+    <Compile Include="Layout\Serialization\LayoutSerializationCallbackEventArgs.cs" />
+    <Compile Include="Layout\Serialization\LayoutSerializer.cs" />
+    <Compile Include="Layout\Serialization\XmlLayoutSerializer.cs" />
+    <Compile Include="MathHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.de.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.de.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.es.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.es.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.fr.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.fr.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.hu.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.hu.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.it.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.it.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.pt-BR.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.pt-BR.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.ro.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.ro.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.ru.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.ru.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.sv.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.sv.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.zh-Hans.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.zh-Hans.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Themes\GenericTheme.cs" />
+    <Compile Include="Themes\Theme.cs" />
+    <Compile Include="Win32Helper.cs" />
+    <Compile Include="WindowHelper.cs" />
+    <EmbeddedResource Include="Properties\Resources.hu.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.hu.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.it.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.it.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.fr.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.es.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.es.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.pt-BR.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.pt-BR.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.ru.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.ru.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.de.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.sv.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.sv.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.zh-Hans.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.ro.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.ro.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <AppDesigner Include="Properties\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\DockBottom.PNG" />
+    <Resource Include="Themes\Generic\Images\DockLeft.PNG" />
+    <Resource Include="Themes\Generic\Images\DockPane.PNG" />
+    <Resource Include="Themes\Generic\Images\DockPaneEmpty.png" />
+    <Resource Include="Themes\Generic\Images\DockRight.PNG" />
+    <Resource Include="Themes\Generic\Images\DockTop.PNG" />
+    <Resource Include="Themes\Generic\Images\HTabGroup.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneBottom.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneLeft.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneRight.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneTop.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneBottom.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneInside.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneLeft.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneRight.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneTop.png" />
+    <Resource Include="Themes\Generic\Images\Locked.png" />
+    <Resource Include="Themes\Generic\Images\PinAutoHide.png" />
+    <Resource Include="Themes\Generic\Images\PinClose.png" />
+    <Resource Include="Themes\Generic\Images\PinDocMenu.png" />
+    <Resource Include="Themes\Generic\Images\PinMenu.png" />
+    <Resource Include="Themes\Generic\Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinMaximize.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinRestore.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Page Include="Themes\generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk
new file mode 100644
index 000000000..1bdc91203
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/sn.snk differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs
index 3e4dde5a8..358fad4bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/EmptyDataItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
index 6b34ba112..8bcda49ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs
index 7f750628e..078787885 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListEnumerator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs
index d7ac905d7..3f60ff8bb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualListTableOfContent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
index d3a5aaadb..3688fa24a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPage.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
index ba07bd504..41bde2fdf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualPageManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs
index 05eb11092..4e5f87536 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs
index b58e9240e..66b1a76e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(DataVirtualization)/VirtualizedItemValueCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
index e55aa52e9..011838840 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataGridForeignKeyDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
index fa7d6a38e..9c57d49ee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/(ForeignKeys)/DataTableForeignKeyDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs
index 32e57c8f9..856743eac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncCommitInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
index af11e831c..db3b3f9e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs
index 4798fa7e6..1513f2402 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AsyncQueryInfoWeakComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs
index 313447eea..259b4e410 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/AutoFilterValuesChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs
index e19eaf81c..ace88293f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/BindingPathValueExtractor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
index 0114466a8..2e14b0efc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CollectionViewGroupExtensions.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs
index f35ac77ed..d2e26886e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CommitItemsEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
index 58bdf23fa..7c4ccd74e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs
index ebc1b90f7..b1b6c46c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemConfigurationCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs
index c8a8814a3..99b326a5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/CustomDistinctValueItemFilterEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
index 11a1690f1..1d626a931 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
index ea25ec26d..1f46abc53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
index e32413a83..b0a3e4bbe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewBaseDataProvider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs
index 757b05067..c0c390af8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewDataProvider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs
index 514bb4e04..254bd0b72 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewEnumerator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
index af81b1f39..787aa7120 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroup.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
index acd60493b..5cce5afa4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupRoot.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs
index 5da6308e0..e7eaae3fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewGroupSort.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
index d7a431ddb..180fcdfae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSort.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
index 2ac951e2a..dbe4fcf1a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSource.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
index 8fa2a03f2..25fbce7be 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCollectionViewSourceBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs
index b8a8e5cea..a61cda367 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCommittingNewItemEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs
index 31e5e524a..0ef957f3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridCreatingNewItemEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
index 348d57632..e8f81cd08 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
index 008387dc8..c0574da2e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridDetailDescriptionCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
index b0691efff..c930c2a2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs
index 7cdc6f8dc..ba7ffdcf2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridGroupInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs
index 9d60edd83..51dfbbaae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemCancelEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs
index 474489b7a..aafe44f04 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs
index dd568e776..03261982c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemHandledEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs
index 717bbfc4d..4c488cfe9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.PropertyDescriptorFromItemProperty.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
index 3e617912b..4fac50379 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemProperty.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
index a120121fa..75dcb025c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.PropertyDescriptorFromItemPropertyBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
index 92c8855c3..ed9466006 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
index e26e44fb4..06e6de66c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs
index 9af868787..03dfb9149 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyCommittingValue.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs
index 9bfd6cf79..fe93c0ff5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyDictionary.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs
index f72532ac2..bdd409c9f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemPropertyQueryValueEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs
index 6fb6d5339..a764a2613 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridItemRemovedEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
index afcfd996a..69d9a07ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridLINQPageManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs
index 9493af156..d5e1e0ea6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs
index c6faa9a77..c00a84ab0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridPageManagerBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs
index e8cbd9e0c..484902e58 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridRemovingItemEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs
index f28d41bb5..0e06cb10b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridSortDescriptionCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
index 37863d034..a570ef298 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridUnboundItemProperty.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
index 2e6922a25..4c68ec3d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
index 3935e6103..bad967af3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs
index c94a324ed..b2bc3288e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewDataProvider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
index 48c2871bd..46fba19ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroup.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
index 9a7cace6a..bb2b4b556 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
index 0dbb38c05..1b5cbc841 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewGroupRoot.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
index acc6151df..de68918e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSource.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
index 69deec350..152a0a942 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingCollectionViewSourceBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
index c0ef6b081..138a2ab41 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs
index 9b432e4be..d1fde7e89 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewDataProvider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs
index bd6266d4d..4a5757600 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroup.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
index b281b26bc..940614882 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewGroupRoot.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
index e1209be52..8f3947742 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataGridVirtualizingQueryableCollectionViewSource.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
index 19b37ed48..3c7c19e97 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRelationDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
index f8a132ed7..23926f648 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DataRowColumnPropertyDescriptor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs
index 02e1a383a..5576ef688 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
index ec7aa9ab8..dae8b5c24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DeferredOperationManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
index 054b802e1..872e762ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/DistinctValuesDictionary.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs
index 3a032fdfe..ed6cf94f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EmptyDataItemSafePropertyDescriptor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
index 7b04871d9..4515e31fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EntityDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs
index e2639f3c8..9bf607fc4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/EnumerableDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs
index 4a9ebedef..b999a42cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupDescriptionCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs
index 4eba59354..2029d28df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupNameCountPair.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
index 8277ad7b9..9bb361479 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/GroupSortComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs
index 023df14a6..b80a5f59e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/JaggedArrayPropertyDescriptor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs
index 8a97b5d9a..fdab96ca5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/ListSourceDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/OptimizedReadOnlyObservableCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/OptimizedReadOnlyObservableCollection.cs
index a3e2519f3..130acab9f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/OptimizedReadOnlyObservableCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/OptimizedReadOnlyObservableCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
index a065c06c4..d1bdae7f7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyDetailDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs
index b30e22e6a..b878a6237 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/PropertyRelationAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs
index 985f43b09..c721f9700 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryAutoFilterDistinctValuesEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs
index e84052ee7..3d69259fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryDistinctValueEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs
index 922ffa2aa..1ecf2f1bf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryEntityDetailsEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs
index 65faba132..b76ad776a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryGroupsEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs
index 0530d5b4f..822ecc557 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemCountEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs
index 015a82f57..dbf338d01 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryItemsEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs
index 62e02d7a8..d9ec92dbf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/QueryableExtensions.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs
index 5924dde0d..d422c4dc1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs
index 0c5f5ea01..fff0886d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemIndexComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
index 761f2e5fe..3a007edc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/RawItemSortComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs
index 1993460f0..7a73eacdd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SelfPropertyDescriptor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs
index 218e6a7db..6976c602d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortDescriptionsSyncContext.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
index fe697cf40..bbd9f7966 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SortedDescriptionInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs
index 727dc56e5..d9f6d4679 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/SourceItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs
index 7e69d1ab2..fdec585f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/StatResultComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
index a4931f9de..298de0f36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs
index 900aa7a1c..d9f5e1543 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(CollectionView)/UnboundDataRowPropertyDescriptor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
index cc3ecf73c..5e8812b32 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/DataTableForeignKeyConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
index 7c1ca2f25..1ee00cbcd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs
index e4b833093..15038bdac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyContentControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
index 537f13971..e0980bdbc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs
index b4f3c3114..6daa204f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyGroupContentControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
index a3d66220d..4cf75feaa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(ForeignKeys)/ForeignKeyScrollTipContentControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs
index 786832784..c71f366bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CollectionGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs
index dd262b3ce..25f13c97a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthChangedHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs
index 62f5dbddc..396dcd11b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ColumnActualWidthEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs
index f3714edcc..69e0071b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ContainersRemovedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs
index 99a6baef2..7567acf39 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CurrentColumnChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs
index be25a5ff4..dbc85a264 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomGeneratorChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
index 4acb1605e..1203ff679 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/CustomItemContainerGenerator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
index cb8a7794f..41bdea0ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DetailGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs
index c8f6a966e..79139bcdd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs
index 4f15ed6ac..f0b59f001 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/DistinctValuesRequestedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs
index de2f5e651..dcad5454d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ExpansionStateEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
index a6765d7a8..ea1ed1cd1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
index fb20f0fb5..2a383858c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeFactory.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
index 0cf74a46c..2a7f77766 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GeneratorNodeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
index f46b15177..44a7e319f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
index ffd687d04..cc8400513 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs
index 60455e21a..fac91861b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupHeaderFooterItemTemplate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Markup;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs
index bc27b1293..7712bf36e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/GroupNamesTreeKey.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
index 064a0aa74..d3a0131df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/HeadersFootersGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
index 07354a265..3fdf60727 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ICustomItemContainerGenerator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls.Primitives;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs
index 2b98bb209..41bf41d26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/IInhibitGenPosToIndexUpdating.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
index 93f882a7b..5986ac07c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemContextVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
index 6a09dae4e..8431c83ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/ItemsGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs
index 7d411049d..1b477e4d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NamesTreeGroupFinderVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
index 58590ce3e..5cfce013c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/NotifyCollectionChangedGeneratorNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Specialized;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
index bc3fd563e..fe01531e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RangeSelectionVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs
index 0d2e423a6..e10c43a6b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs
index ae8b1c55e..b932c4cce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/RealizedContainersRequestedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
index 7d34dee87..8ab24f65b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreDataGridContextStateVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
index 58eb022ad..727a93165 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreGlobalStateVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs
index 386d7a3fc..34abfd3ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SaveRestoreStateVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs
index 180203482..fecd68bdc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/SelectAllVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs
index e4fcfa8d9..54c16ac28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs
index 24a84a783..bf9e4af70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedReverseComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs
index bbabd7097..141b848dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/StickyContainerGeneratedStruct.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs
index 5051483c1..493ea8697 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibilityChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs
index a12c382e7..3a07257eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/VisibleColumnsUpdatedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
index 1822c2a2e..1466ab013 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(Generator)/WeakDataGridContextKey.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs
index 9c0ed0b6b..67ea8ba42 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/AutoFilterModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs
index e0bdbcc60..c59423543 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CellEditorDisplayConditionsEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs
index c5a17ad87..19b926a7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ColumnWidthUnitTypeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs
index 66adeda0e..5b7711f40 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CommitModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs
index 771c12f9b..1f941bb76 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/CompareResultEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs
index 2482ac385..9402538ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ConnectionLineAlignmentEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs
index 74d72dc06..05c4a35a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridConnectionStateEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs
index 5ba4c25a6..37a7bd311 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridContextVisitorTypeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs
index 04d899bfc..a5096c015 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DataGridUpdateSourceTriggerEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs
index 0b5319298..703794850 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DeletingSelectedItemErrorActionEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs
index 918c08cd2..b77db307d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesConstraintEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs
index 8a1b11fbb..9cf96663a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DistinctValuesUpdateModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs
index c3458fc48..094d8898b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/DropMarkAlignmentEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs
index 4f9ce0ed9..0e0560b60 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/EditTriggersEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs
index 1f55b0dd0..1a23c1f2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterCriteriaModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs
index d7a63797a..cbe2d8f36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterOperatorPrecedenceEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs
index a0c471251..702627fdb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/FilterTokenPriorityEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs
index 663525077..b71c66b9a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/GeneratorNodeTypeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs
index 9ffe71ebb..1b50e8987 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/InsertionModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs
index 42f4bf1df..35ebd279f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ItemScrollingBehaviorEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs
index ad5baa51b..f6e030685 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/NavigationBehaviorEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs
index a4b8883f8..6c2f5a812 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PagingBehaviorEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs
index d69d2d905..84c376891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/PrimaryAxisEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs
index 0fae7079c..082fdf90c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollDirectionEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs
index 6b2b6c4d2..cddd41650 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ScrollOrientationEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs
index 9089399a3..de69a0bdb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SelectionUnitEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs
index 738c6c357..f1d536cdd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/SortDirectionEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs
index 3d24e4091..83d94ce6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/(enums)/ValidationModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs
index 6af042620..999bbed83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGesture.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs
index c0b8097ee..13062af95 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ActivationGestureCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs
index 85da6bf67..967495749 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AddingNewDataItemEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs
index eb05d3f00..19df22da1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AllowDetailToggleChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
index 0b2ede2dd..abfd23d3d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfo.cs
@@ -1,25 +1,25 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 [assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
 
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "1.9";
+  public const string BaseVersion = "2.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs
index e67d3d81f..3316fb13a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/AssemblyVersionInfoCommon.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 internal static class _XceedVersionInfoCommon
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs
index d9a46b642..842fd91b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationPeerExtensions.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs
index 8f91b1f0a..3bc1d6bab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/AutomationQueryEvents.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs
index 776facf7c..f3b5daa63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/CellAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs
index 80f0cfb67..44e397c0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerCellAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs
index 3099effdd..ef0d65bf7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/ColumnManagerRowAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs
index ffb9551e4..6c180993f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridContextAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs
index 98fdb58d0..4f449eaa8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridControlAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs
index 17246c2c7..0eb982746 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridGroupAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs
index 01b7466ca..2aa310816 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs
index d25dd7f58..44a4c367c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/DataGridItemCellAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs
index f492f5a70..23a3cdf8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/HeaderFooterItemAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs
index 647cffe4b..3885a042a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryAutomationIdRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs
index a80a163a8..ec8b4dc89 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryHelpTextRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs
index b7cfb7985..92c52d329 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemStatusRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs
index abc41eb10..62250112d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryItemTypeRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs
index 60023a73d..cb13e8a6a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/QueryNameRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs
index e1cda763f..0956bc767 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Automation/RowAutomationPeer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs
index 1de659957..0171d10a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CanBeCurrentWhenReadOnlyChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CancelRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CancelRoutedEvent.cs
deleted file mode 100644
index 7e5654148..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CancelRoutedEvent.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.Windows;
-
-namespace Xceed.Wpf.DataGrid
-{
-  public delegate void CancelRoutedEventHandler( object sender, CancelRoutedEventArgs e );
-
-  public class CancelRoutedEventArgs : RoutedEventArgs
-  {
-    public CancelRoutedEventArgs()
-      : base()
-    {
-    }
-
-    public CancelRoutedEventArgs( RoutedEvent routedEvent )
-      : base( routedEvent )
-    {
-    }
-
-    public CancelRoutedEventArgs( RoutedEvent routedEvent, object source )
-      : base( routedEvent, source )
-    {
-    }
-
-    #region Cancel PROPERTY
-
-    public bool Cancel
-    {
-      get
-      {
-        return m_cancel;
-      }
-
-      set
-      {
-        m_cancel = value;
-      }
-    }
-
-    private bool m_cancel;
-
-    #endregion Cancel PROPERTY
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
index 519dc1ccd..c06f5f2c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Cell.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -34,6 +34,7 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.DataGrid.Automation;
 using Xceed.Wpf.DataGrid.ValidationRules;
 using Xceed.Wpf.DataGrid.Views;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs
index a93f58655..d8a519d0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
index 56616e0c4..2a2cbae8c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentPresenter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs
index 2f6a7ddb9..f2d46f094 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellContentTemplateChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs
index acd0f66ad..6be35cc3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs
index 2e9a87df5..b24a929c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorContext.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs
index 847dc75f5..91a1c3aaf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellEditorDisplayConditionsChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs
index 7fecc00c4..d91a2e9eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellState.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs
index 4f3d7f8df..ad8404621 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidatingEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs
index c4d2d0435..f4f32c918 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationContext.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs
index 5b266bf54..2f2153861 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationError.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using Xceed.Wpf.DataGrid.ValidationRules;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs
index 50d57c8c2..b361e3ee3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CellValidationErrorRoutedEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs
index 0a9cacd28..448cb17a1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml
index a6edcf649..991b0bf2d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.GenericContentTemplateSelectorResources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary x:Class="Xceed.Wpf.DataGrid.GenericContentTemplateSelectorResources"
                     x:ClassModifier="internal"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
index c5ac6ed6d..477497cce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Column.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
index 4636e7e79..f7d76a088 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
index 7ad7c48f7..9bec1e01c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
index 028c8a22f..c746db14f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerCell.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.ComponentModel;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
index fe814e72b..0766e5eef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnManagerRow.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using Xceed.Wpf.DataGrid.Views;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs
index 746687bff..dae9779d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnReorderingEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs
index e4c3b939c..b7c73dddb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnVisibilePositionChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs
index c224ff071..07f853e4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ColumnWidth.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs
index 1a5841afc..c5fa02fea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ContainerSizeState.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs
index 4baeb69e7..4cbf812cd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ColumnWidthConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs
index 9687cf3e1..15d5cce13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/CurrencyConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs
index ffc01a199..c3198de9f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/DefaultDataConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
index 5eb7b598f..ae57b6439 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/EmptyStringToBooleanConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToForeignKeyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToForeignKeyConverter.cs
index 6720fb849..779b5cab3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToForeignKeyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToForeignKeyConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToNullableBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToNullableBoolConverter.cs
index 238abd201..b3c22e07b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToNullableBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/FilterCriterionToNullableBoolConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs
index 3bfcf7fed..7a4ead6ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/GreaterThanZeroConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Text;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs
index 3afd37dda..b0e12d71d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ImageConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs
index 613939e4b..60c0425d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IndexToOddConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs
index a808af24e..c87ab3500 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/IntAdditionConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs
index 907af8a3d..19ecb5e4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/InverseBooleanConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs
index e15c5d3c0..7a50af56a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/LevelToOpacityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs
index f8b4c684f..4efb2ec79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/MultimodalResultConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs
index 5d27d1d02..dbc8eb5d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NegativeDoubleConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs
index 997986530..ddf9cc586 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/NullToBooleanConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs
index 8d448b543..0d00a3c55 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SortingDirectionToBooleanConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs
index 57fee3486..220449209 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SourceDataConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StatResultConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StatResultConverter.cs
index 32a52c0d8..2668c10a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StatResultConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StatResultConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs
index f3de4784b..8655f195e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/StringFormatConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs
index cdb9099b0..ee65aba98 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/SynchronizedScrollViewerMultiConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs
index 4b7f16bed..b2ad2c19b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ThicknessConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs
index 6e9299f9c..d5db71b81 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TreeViewLineConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs
index c48b96bc5..f47fd34f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToBooleanConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs
index 8a7aa9915..4ae5b69d4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/TypeToVisibilityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs
index 3e7ecac34..675ac832f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Converters/ValueToMaskedTextConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
index f1c1e1124..c272ecbb5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/CurrencyManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
index 9b9055bfa..0b060d692 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataCell.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
index 42c31e43a..79383acb2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridBindingInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCheckBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCheckBox.cs
index d0507ffdb..135783f2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCheckBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCheckBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs
index 9cb2be57d..59b1d6b04 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
index f432f7420..bf452dda7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridContext.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.ObjectModel;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
index 629adc19f..622fe3847 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -49,6 +49,7 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Printing;
 using System.Windows.Media.Imaging;
 using Xceed.Wpf.DataGrid.Utils;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
@@ -4731,29 +4732,8 @@ public override void OnApplyTemplate()
       if( this.TemplateApplied != null )
         this.TemplateApplied( this, EventArgs.Empty );
 
-      this.UpdateDataGridAdorner();
     }
 
-    private void UpdateDataGridAdorner()
-    {
-      Xceed.Wpf.DataGrid.Views.ViewBase view = this.GetView();
-      bool needAdorner = !view.UseDefaultHeadersFooters;
-      if( needAdorner && (m_mainAdorner == null) )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-        m_mainAdorner = new DataGridMainAdorner( this );
-        adornerLayer.Add( m_mainAdorner );
-      }
-      else if( !needAdorner && ( m_mainAdorner != null ) )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-        adornerLayer.Remove( m_mainAdorner );
-        m_mainAdorner = null;
-      }
-    }
-
-
-
     public void ExpandGroup( CollectionViewGroup group )
     {
       if( group == null )
@@ -6313,43 +6293,6 @@ public void Dispose()
 
     #endregion
 
-    #region DataGridMainAdorner Private Class
-
-    private DataGridMainAdorner m_mainAdorner;
-    private class DataGridMainAdorner : Adorner
-    {
-      static DataGridMainAdorner()
-      {
-        string c = Char.ConvertFromUtf32( 169 );
-        m_sDisplayText = new FormattedText( c + " \u0058\u0063\u0065\u0065\u0064",
-          System.Globalization.CultureInfo.InvariantCulture,
-          FlowDirection.LeftToRight,
-          new Typeface( "Verdana" ),
-          12, new SolidColorBrush( Color.FromArgb( 150, 250, 100, 0 ) ) );
-      }
-
-      private static FormattedText m_sDisplayText;
-
-      public DataGridMainAdorner( UIElement adornedElement )
-        : base( adornedElement )
-      {
-        this.IsHitTestVisible = false;
-      }
-
-      protected override void OnRender( System.Windows.Media.DrawingContext drawingContext )
-      {
-        base.OnRender( drawingContext );
-
-        drawingContext.PushTransform( new RotateTransform( -90 ) );
-        drawingContext.PushTransform( new TranslateTransform( -this.ActualHeight, 0d ) );
-        drawingContext.DrawText( m_sDisplayText, new System.Windows.Point( 32, 2 ) );
-        drawingContext.Pop();
-        drawingContext.Pop();
-      }
-    }
-
-    #endregion
-
     #region DataGridControlSetFocusInhibiter Private Class
 
     private sealed class DataGridControlSetFocusInhibiter : IDisposable
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs
index 645e3afbd..e7c795d27 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlSelectionChangedWeakEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs
index f6f03ad8e..59b4f5155 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridControlTemplateChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs
index c0aec71b7..ecb0e508e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangedEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs
index 8e281406b..1d6eaf2ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridCurrentChangingEvent.cs
@@ -1,23 +1,24 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
index 861e4af8e..b96dfc5cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridDatePicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
index d376a112e..26f8c0980 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs
index 58f391510..cc4483002 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridFocusException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs
index 7af36fdfc..bcbaf37ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridInternalException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Runtime.Serialization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
index bf5b8bd2c..5a92d3774 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridItemsHost.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs
index 0540a7b01..4c17ee175 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangedEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs
index c11c99a68..8e2734f60 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridSelectionChangingEvent.cs
@@ -1,22 +1,23 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
 using System.Windows;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs
index fdafd1e86..b1b3917a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridValidationException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
index 44e383f7b..389e85d26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataGridVirtualizingPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Specialized;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
index a102a0fa8..cfc88f5d5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRow.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs
index 8a8ea3fb6..55dadda3e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DataRowEditableWrapper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
index a586bc465..5e19812ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <FrameworkElement x:Class="Xceed.Wpf.DataGrid.DefaultCellEditorSelector"
                   x:ClassModifier="internal"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
index 6b5228c99..42f0f29e5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultCellEditorSelector.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
index 7037adc13..f7a5f4c38 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DefaultDetailConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs
index 945cd71cb..db57f5003 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DeletingSelectedItemErrorRoutedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
index 559fbb45a..78daf2342 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
index dc792a0dc..be1a210e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailConfigurationCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs
index 1540b2c47..e4e7a52e4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs
index a12154890..de159e5a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailVisibilityChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs
index 0a5007a93..958a9c6aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DetailsChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
index be1d37722..9ad2463c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/DropMarkAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
index 5cd3800b7..8a075453b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/ClipboardExporterBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs
index 0a91aa84b..608f271e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/CsvClipboardExporter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs
index b31766467..3400f3ddc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/(Clipboard)/XceedDataObject.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs
index f5a7f9b3a..8fa374647 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/CsvFormatSettings.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
index 56f86b1c5..fc1a7df71 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs
index c24b8a117..e3dad557a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Export/FormatSettingsBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs
index 43a9c3c53..e03ae7ae1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs
index 825d12f13..97ef71bbe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs
index e0d76e767..733b1b366 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FieldNameGroupConfigurationSelectorItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs
index b7a4e8a3e..0e15ef1c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/AndFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs
index f06f78c77..dc479eea3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/ContainsFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs
index f13cc65a5..e85fb8286 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/CriterionDescriptorAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs
index 5614933c3..02a6fafb8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/DifferentThanFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs
index 441a0c98c..b7e02434d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EndsWithFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs
index a03d23e2b..bc109faae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/EqualToFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs
index a65482807..52fc32e8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/FilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs
index 481b18577..7d7530e8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs
index 5714dfdba..db1b70a67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/GreaterThanOrEqualToFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs
index 808eccdb6..3888f67fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs
index e2708ade0..62e26dddc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/LessThanOrEqualToFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs
index bd4fc5c8b..748366363 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/NotFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs
index f319ca213..96544b740 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/OrFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs
index 2c1f50222..bff39a053 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/RelationalFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs
index 50ada465b..200374d0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterCriteria/StartsWithFilterCriterion.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs
index b386158ff..919bb6e75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs
index 2aa00023b..e4116f0e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParserTestWindow.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 #if DEBUG
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs
index 8d843c45f..9baf96359 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FilterParser_UnitTests.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 #if DEBUG
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs
index cd4714eec..f4c64c5df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ForeignKeyConfigurationChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs
index 3b24c3cf8..9820d4c8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/FrameworkElementUnloadedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs
index c6bfb3497..f43d76a57 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GlobalSuppressions.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
index 0047c9eac..ab7aa1231 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Group.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
index ff6ecd45b..7ad250ba7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
index 15edd0e58..d13817a9d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupByItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs
index 83f135a56..db2f78127 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.ObjectModel;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
index b7799f68d..321c288b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs
index 3fa32e778..91f38f283 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupConfigurationSelectorChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs
index 34a14297b..036964b1e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupExtensions.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
index db55a26e5..5c7c4b987 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.ComponentModel;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs
index 08411a138..25373dc47 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupHeaderFooterCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs
index 1e7d477c5..9b7742a86 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfiguration.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs
index 6a215de51..cf171cd20 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelConfigurationCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs
index 7bc9d20a5..78f3bd6d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescription.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs
index c7855359a..3786a8b52 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelDescriptionCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs
index 7e46e0e3d..b83b67f7a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
index 88a0a5dac..ec8bc19e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupLevelIndicatorPane.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs
index dac570dd0..72b759e67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationButton.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs
index 175e6ade0..eabe4c86a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs
index 807e3f549..45fc96666 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupNavigationControlItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs
index ddc1324a9..7de24f0c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/GroupingHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs
index 7d68b2213..39b93cecb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HashedLinkedList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
index ebd3e5b79..d51981fc4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HeaderFooterItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
index 69abd190b..740e7d4a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -261,31 +261,6 @@ public object NoGroupContent
 
     #endregion NoGroupContent Property
 
-    #region PROTECTED METHODS
-
-    public override void OnApplyTemplate()
-    {
-      base.OnApplyTemplate();
-
-      if( ( LicenseManager.UsageMode != LicenseUsageMode.Designtime )
-        && ( m_watermarkAdorner == null ) )
-      {
-        AdornerLayer adornerLayer = AdornerLayer.GetAdornerLayer( this );
-        m_watermarkAdorner = new WatermarkAdorner( this );
-        adornerLayer.Add( m_watermarkAdorner );
-      }
-    }
-
-    protected override Size MeasureOverride( Size constraint )
-    {
-      Size groupByControlSize = base.MeasureOverride( constraint );
-      m_watermarkAdorner.Measure( constraint );
-      return new Size( groupByControlSize.Width + m_watermarkAdorner.DesiredSize.Width
-                      , Math.Max( groupByControlSize.Height, m_watermarkAdorner.DesiredSize.Height ) );
-    }
-
-    #endregion PROTECTED METHODS
-
     #region PROTECTED INTERNAL METHODS
 
     protected internal virtual void PrepareDefaultStyleKey( Xceed.Wpf.DataGrid.Views.ViewBase view )
@@ -689,6 +664,5 @@ internal void UpdateHasGroups()
 
     #endregion
 
-    private WatermarkAdorner m_watermarkAdorner;
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
index b21921d0a..caf8cadb3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByControlNode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
index 259cbb285..28683f910 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupByItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
index a510e6f07..e3b87e159 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/HierarchicalGroupLevelIndicatorPane.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs
index 4264bef5a..2097ed189 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ICustomVirtualizingPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs
index 21a91cf31..60d5538e5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitable.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs
index a87d47ce7..128d1a204 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridContextVisitor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
index a710f0bfa..ea0e6b648 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDataGridItemContainer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs
index d8bdf66a8..6c111df0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/IDeferableScrollInfoRefresh.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
index 99db2a7e9..f613bf2ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/InnerCellContentPresenter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs
index be2639518..b48ecd0ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemPropertiesChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs
index bdf415b46..70e2d2b6b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsHostUIElementCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs
index d6b4ee163..8bc403a4d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
index 5d1bc6440..efa71273b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ItemsSourceHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Xml;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs
index ac9971066..b3533f125 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/KeyActivationGesture.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs
index 6818366b8..6668e80ce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs
index 6da78ed11..80a378fc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs
index b5394744a..a50a0ba8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/LevelGroupConfigurationSelectorItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs
index bcca80b3b..64eb75264 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Log.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs
index b63fa6f97..ee6261edc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellContentBindingExtension.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs
index 64bd3cc42..81e0e6120 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/CellEditorBindingExtension.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs
index dc9003aec..ab4ca7dc3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearGroupLevelConfigurations.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs
index d304bfa24..5b5d89113 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ClearHeadersFooters.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs
index c9c7856e5..6e79c6c84 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -87,6 +87,10 @@ public override object ConvertFrom( ITypeDescriptorContext context, System.Globa
           case "windows7theme":
             theme = s_windows7Theme;
             break;
+          case "windows8":
+          case "windows8theme":
+            theme = s_windows8Theme;
+            break;
         }
 
         if( theme == null )
@@ -106,5 +110,6 @@ public override object ConvertFrom( ITypeDescriptorContext context, System.Globa
     private static readonly Theme s_royaleNormalColorTheme = new RoyaleNormalColorTheme();
     private static readonly Theme s_zuneNormalColorTheme = new ZuneNormalColorTheme();
     private static readonly Theme s_windows7Theme = new Windows7Theme();
+    private static readonly Theme s_windows8Theme = new Windows8Theme();
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
index 0e9faf93d..09b68f80c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ThemeKey.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs
index 15981e4a3..c3fc68915 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewBindingExtension.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs
index f00346bbb..257ea898d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Markup/ViewConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs
index 56b9da50c..cfe94f642 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxGroupLevelsChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs
index b78058387..edc9fe8b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/MaxSortLevelsChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs
index 8b412554b..60a5c8af7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ObjectComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Print/IPrintInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Print/IPrintInfo.cs
index 043f086f9..cfc9dac33 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Print/IPrintInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Print/IPrintInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
index a917398d0..c9aa8ab7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Properties/AssemblyInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 #region Using directives
 
@@ -36,7 +36,7 @@ This program is provided to you under the terms of the Microsoft Public
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Extended WPF Toolkit - DataGrid" )]
-[assembly: AssemblyCopyright( "Copyright � Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
 
 
 [assembly: CLSCompliant( true )]
@@ -75,6 +75,6 @@ This program is provided to you under the terms of the Microsoft Public
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"sn.snk" )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
index 06955ac10..f847c2ddd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ReadOnlyColumnCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs
index 853118dcc..19f99ad1c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RecyclingManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
index 2f1e408d1..54d48f110 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Row.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -40,6 +40,7 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.DataGrid.Automation;
 using System.Windows.Threading;
 using System.Windows.Media.Animation;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.DataGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
index 9c1ab8ad8..dbed446fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
index 4d819de0f..0954ec0a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowSelectorPane.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs
index f05ef6bab..225b1c8df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowState.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs
index abe6dfcf8..5f33474e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationError.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs
index f9bf5f8d6..49ce8f3cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/RowValidationErrorRoutedEvent.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs
index f140f58c2..379745a26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollChangedWeakEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
index 2662c977c..63ab2e71a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollTip.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs
index 8b9ec1bf6..ae7448d7f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ScrollViewerHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
index 019773a97..0b1edd46b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedCellsStorage.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
index 2d0ac07cb..339aa6857 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectedItemsStorage.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
index 5cd2023bf..394c17f7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRange.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
index ab68f82ca..63c9e8632 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
index f08785483..c9e67cd46 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionCellRangeWithItems.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs
index 92f55c54b..5c229dc98 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
index a88b3b38b..b854c5f26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionChanger.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs
index c089d28ba..dedbbb942 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
index 71cd5dd06..b1ae19112 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
index 685e04b68..95d7e215f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionItemRangeCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
index cce51198f..34befa1f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
index a23c3e69d..50f8e1577 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRange.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
index 3025a499f..726bd2b2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SelectionRangeWithItems.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/UserSettingsEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/UserSettingsEnum.cs
index 63e5b5c4a..d33ce0243 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/UserSettingsEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/UserSettingsEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/XmlColumnWidthStruct.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/XmlColumnWidthStruct.cs
index 65a75b8a1..85b1eec42 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/XmlColumnWidthStruct.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Settings/XmlColumnWidthStruct.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortingHelper.cs
index 5901c82b7..d460648b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortingHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/SortingHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs
index 262bd406a..06aa59b64 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/StaircasePanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidSourcePropertyNameException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidSourcePropertyNameException.cs
index 65c865c74..d9af23d6b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidSourcePropertyNameException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidSourcePropertyNameException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Runtime.Serialization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidValueException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidValueException.cs
index 6f1cd818b..1d895e725 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidValueException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/InvalidValueException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Runtime.Serialization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs
index d81fb12b3..9cf553330 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunction.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs
index 03580e0e3..38b1d3c21 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs
index af796635a..11fb7d06d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatFunctionComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs
index 54b27a28c..39ba63ba0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Stats/StatResult.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs
index 62ac11ce6..8090dc2ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/TextInputActivationGesture.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs
index 4021e1927..719e0dba4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ThemeChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs
index e41ab069d..c7fa81fe2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/UnboundColumn.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs
index 34fbf8b54..81e2f2e77 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/EnumerableWrapper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs
index 5574296f7..2d827c5d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/IndexWeakHeapSort.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs
index 79f19e75f..52c20ba23 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ListChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
index 807c1b640..47feb1284 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableHashList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs
index b81d28d95..c0981fc44 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ObservableList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs
index e757aa433..2cbae59bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyDictionary.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs
index b2ab5cb5f..a36eb5c13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Collections/ReadOnlyObservableHashList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs
index 130daea8a..52b4482b3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/BoolDataStore.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs
index f3334ea74..420a52aab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/DataStore.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs
index 64bc7c323..1247255ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ObjectDataStore.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs
index 42c899e0e..a50c7c6f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/StringDataStore.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs
index 8e633ce84..c4273c708 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Data/ValueTypeDataStore.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs
index 12221250c..1afb14d10 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Math/DoubleUtil.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
index 20c5a4397..683ec5116 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/WeakEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 /**************************************************************
  * 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs
index 0f59f354d..e7529b4df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DispatcherHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
index 2c592cca4..9e7b99558 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragDropHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
index 21bc21474..c8b5da445 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DragSourceManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs
index b07efd792..e5ed5bb96 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/DraggedElementAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
index b73694b88..cb2d7a23a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/DragDrop/IDropTarget.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs
index fed61ea62..a32e436d0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/Markup/XceedResourceDictionary.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs
index 4a5f0bbcb..a9d39abba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/Wpf/TreeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs
index e5f28b13f..89829d071 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Utils/XmlSerialization/XmlSerializableBaseType.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 
 using System;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
index ffd573d73..8934bacad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidateInputWrapper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs
index 405076a90..16d229f55 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellContentBindingValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs
index f52d6d565..10f563a75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorErrorValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs
index 6e3968245..d46bbe10f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellEditorValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs
index ec7c004ec..d7a11ec87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/CellValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs
index 11df1381c..299180065 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/EventCellValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/FilterExpressionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/FilterExpressionValidationRule.cs
index 7a5f7b886..109d0662e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/FilterExpressionValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/FilterExpressionValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs
index c77c02bfd..b0f34c365 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/PassthroughCellValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs
index 4ed07289e..ec166a033 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ValidationRules/SourceDataConverterValidationRule.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs
index ed45d02b1..543df4e34 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/ViewChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
index be936f6b9..aa2c071f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/ColumnVirtualizationManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
index 9448ffe34..4195e1435 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/TableViewColumnVirtualizationManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
index de64d07a8..2754eece1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs
index 9de658c16..d9d04a65b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/UpdateMeasureRequiredEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
index 26e67aae3..1ca2b7143 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingFixedCellSubPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
index 769f171a8..de11e6e84 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(ColumnVirtualization)/VirtualizingUICellCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs
index 75485ea00..c09c12f1d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ColumnStretchModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs
index 652bea1a0..945af0eed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/DropMarkOrientationEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs
index 9f391d8a8..830ead101 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/PassiveLayoutAxisEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs
index dc65e6c08..dd4f82f72 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/SynchronizedScrollViewerPositionEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs
index 1cf7a83f5..dcc592721 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(Enums)/ViewPropertyModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs
index f4d76d440..054c3a409 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/AnimatedDraggedElementAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
index c2bfb1206..b2f324357 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ColumnReorderingDragSourceManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs
index c29c60eaf..513dd5ec6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/IAnimatedScrollInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs
index d747ae407..3225c616d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs
index 6ddbac48a..adb1be735 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/LayoutedContainerInfoList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs
index f5fc15cd3..0ba394aea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/OffsetAnimation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs
index 11ace56b3..406399eac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/PointAnimation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs
index 41e6038d7..9bad24758 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs
index d172d53a3..3e893f3f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs
index 13cc9622c..666da5267 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoList.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs
index 882a73a2b..8e08735b3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/StickyContainerInfoReverseComparer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs
index e68475d94..3b630d8fd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs
index f843274f9..aa68882f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewAnimationHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
index 63dafe971..fb99ff611 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewItemsHost.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs
index 13dd09e91..ce4936a1f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/TableflowViewUIElementCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs
index 356d2cb9e..288447e42 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/(TableflowView)/ZOrderHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
index 8d4957163..4ba4215d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ColumnStretchingManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs
index 7cdb4f916..ecc685eda 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushes.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Media;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml
index c59426c6a..44e15e308 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary x:Class="Xceed.Wpf.DataGrid.Views.DataGridControlBackgroundBrushesResources"
                     x:ClassModifier="internal"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs
index 79afa6856..2f4b3e2aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridControlBackgroundBrushesResources.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
index 67d5f5313..cbaa80a63 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/DataGridScrollViewer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
index a1de25996..08a77856b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
index dec6717ae..0e5fb9014 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedCellSubPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs
index 0996ce2ae..e4c6db692 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/FixedColumnSplitter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
index 91a3bd6ca..4240f0ce0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/IVirtualizingCellsHost.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs
index 91b66a9d2..f502755d7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/PassiveLayoutDecorator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs
index 9ea8c618b..e01b87bfc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ScrollingCellsDecorator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
index bfaddf8a9..7017aa801 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/SynchronizedScrollViewer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
index f3fe3fed2..1dbe73dd5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs
index 7d8b14df3..6563cb8ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewHeaderFooterPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
index 3255f4b3d..a9f6196c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewItemsHost.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
index ccedb9511..f1ebc7ba0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TableViewScrollViewer.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs
index ac39373c8..7ee79e4dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/TargetViewAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
index 18ef96475..04397f52d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/Theme.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -92,4 +92,9 @@ public class ZuneNormalColorTheme : Theme
   public class Windows7Theme : Theme
   {
   }
+
+  [TargetView(typeof(TableflowView))]
+  public class Windows8Theme : Theme
+  {
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs
index 8a6b0d553..53d3abe79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UICellCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
index 08a05e551..b061f5093 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/UIViewBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -33,7 +33,7 @@ public abstract class UIViewBase : ViewBase
     #region Static Fields
 
     // We must add a setter since this value is used as default
-    // value of a DependencyObject which will be instanciated
+    // value of a DependencyObject which will be instantiated
     // before the static constructor is called
     internal static Cursor DefaultGroupDraggedOutsideCursor
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
index ec2e437ea..d35aad6f4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs
index f7962182d..c54845b16 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Views/ViewPropertyAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
index 98d5ca22b..fa32e42ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs
index 2ad570bbf..a70e02b52 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingCellCollectionChangedEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs
index 78f3f34ce..406cff4ab 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VirtualizingStackPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs
index fc7ad446d..efd02a2bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/VisibleColumnsUpdatingEventManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs
index 08defd93a..2eaf65b70 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/WatermarkAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
index 8f039c901..c244ec2b3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/Xceed.Wpf.DataGrid.csproj
@@ -17,7 +17,7 @@
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
-    <TargetFrameworkProfile />
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>
     </AssemblyOriginatorKeyFile>
@@ -317,7 +317,6 @@
     <Compile Include="%28enums%29\NavigationBehaviorEnum.cs" />
     <Compile Include="%28Generator%29\GroupNamesTreeKey.cs" />
     <Compile Include="%28Generator%29\NamesTreeGroupFinderVisitor.cs" />
-    <Compile Include="CancelRoutedEvent.cs" />
     <Compile Include="CellValidationErrorRoutedEvent.cs" />
     <Compile Include="ContainerSizeState.cs" />
     <Compile Include="Converters\CurrencyConverter.cs" />
@@ -624,6 +623,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="themes\aero2.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="themes\Aero\TableflowView.Aero.normalcolor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -770,6 +773,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="themes\Windows8\Resources\TableView.Windows8.Graphics.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="themes\Windows8\Resources\Windows8.Resources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="themes\Windows8\TableflowView.Windows8.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="themes\zune.normalcolor.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.Resources.xaml
index e2a7ef254..ae69bff0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
index ace74f0c8..c53675e19 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/Aero.normalcolor.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
index e69954105..164210bec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/Resources/TableView.Aero.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
index 725460461..60e255ced 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableView.Aero.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
index da72e940b..e20fcc40d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Aero/TableflowView.Aero.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.Resources.xaml
index 91f3704e9..b6d63dc41 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Graphics.xaml
index fbe8775fc..2b23bfddc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
index fe248276c..1c4faebac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/Resources/Classic.systemcolor.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
index 8111914f9..f095316dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableView.Classic.systemcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
index 6bfc9fc09..8460e0b57 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Classic/TableflowView.Classic.systemcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
index 5e91b72c5..e950e2732 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Common.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
index 8c15d44e1..d9c942eb2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
index f9464179e..ca151164a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableView.GridElementTemplates.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
index e3152abc5..10c8aba6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Common/TableflowView.GridElementTemplates.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml
index 6474146e3..891429fa0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/FixedColumnSplitter.generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" >
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
index ea279caae..65c12801c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Controls/TableViewScrollViewer.generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.Resources.xaml
index bf4d2b483..47a54c960 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
index c4d6f5590..0f605cf5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.homestead.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
index 53e4c0ad6..b3636d11d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.metallic.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
index 108993ca5..9bc51f8e6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/Luna.normalcolor.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml
index 3cbdece8c..0347f0429 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/Resources/TableView.Luna.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
index dfe3aa572..3a5e2aa34 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.homestead.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
index f7a548acc..82ac72e57 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.metallic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
index 7fcdeeaf5..dd59b1943 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableView.Luna.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
index b0bc11c8a..f827c1a61 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.homestead.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
index 8ca8e6fce..303e4e466 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.metallic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
index 846a66641..2e9e40c8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Luna/TableflowView.Luna.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.Resources.xaml
index fdcffb726..5299c9275 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
index f384ef017..4cd258a36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/Royale.normalcolor.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml
index b5e979d94..3a857c9fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/Resources/TableView.Royale.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
index a557477d3..d80333815 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableView.Royale.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
index 138ba1c0a..203ef8d7f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Royale/TableflowView.Royale.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/TableView.Windows7.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/TableView.Windows7.Graphics.xaml
index 00d038093..cc58d12dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/TableView.Windows7.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/TableView.Windows7.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
index b473039cf..f9617b1bd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Controls.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
index d363df6da..31daaba81 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/Resources/Windows7.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
index 6977c867f..52ce2918a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableView.Windows7.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
index d28f72814..2a9c291b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows7/TableflowView.Windows7.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/TableView.Windows8.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/TableView.Windows8.Graphics.xaml
new file mode 100644
index 000000000..fc1472f9a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/TableView.Windows8.Graphics.xaml
@@ -0,0 +1,256 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:utils="clr-namespace:Xceed.Utils.Wpf.Markup">
+
+    <ResourceDictionary.MergedDictionaries>
+
+        <!-- Include the standard graphics -->
+        <utils:XceedResourceDictionary XceedSource="/Xceed.Wpf.DataGrid;component\themes/Common/Graphics.xaml" />
+
+        <!-- Needs Windows8 Resources -->
+        <ResourceDictionary Source="Windows8.Resources.xaml" />
+
+    </ResourceDictionary.MergedDictionaries>
+
+    <DataTemplate x:Key="editingRowGlyph">
+        <Grid Height="14"
+            Width="14"
+            HorizontalAlignment="Left"
+            VerticalAlignment="Top">
+            <Path Margin="1.096,0.056,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="13.743"
+               Width="12.78"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M1.3590614,15.244263 C1.3590614,15.244263 6.4018121,12.915144 6.4018121,12.915144 6.4018121,12.915144 14.109009,4.1845135 14.109009,4.1845135 14.109009,4.1845135 10.645327,1.617551 10.645327,1.617551 10.645327,1.617551 2.7735772,10.131863 2.7735772,10.131863 2.7735772,10.131863 1.3590614,15.244263 1.3590614,15.244263 z"
+               Stroke="#FF002647"
+               StrokeThickness="1"
+               Fill="#FF002647" />
+            <Path Margin="1.293,8.281,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="5.358"
+               Width="4.921"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M1.5429214,15.130966 C1.5429214,15.130966 6.4629087,12.423883 6.4629087,12.423883 6.4629087,12.423883 5.3522882,10.021933 5.3522882,10.021933 5.3522882,10.021933 3.3217649,9.7752304 3.3217649,9.7752304 3.3217649,9.7752304 1.5429214,15.130966 1.5429214,15.130966 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.1846440410613174,0.5041270477469605"
+                                    GradientOrigin="0.1846440410613174,0.5041270477469605"
+                                    RadiusX="0.8296137405478166"
+                                    RadiusY="1.6531750098768538">
+                        <GradientStop Color="#FFffcc99"
+                                Offset="0" />
+                        <GradientStop Color="#FF9B6803"
+                                Offset="0.9611110091209412" />
+                        <GradientStop Color="#FF996600"
+                                Offset="0.9833329916000366" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="3.11,0.456,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="10.534"
+               Width="10.266"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M3.358902,9.9091635 C3.358902,9.9091635 3.6575527,10.98584 3.6575527,10.98584 3.6575527,10.98584 5.017499,10.948517 5.017499,10.948517 5.017499,10.948517 5.2315655,12.080843 5.2315655,12.080843 5.2315655,12.080843 6.338026,12.48374 6.338026,12.48374 6.338026,12.48374 13.62499,4.3498156 13.62499,4.3498156 13.62499,4.3498156 10.224961,1.9498379 10.224961,1.9498379 10.224961,1.9498379 3.358902,9.9091635 3.358902,9.9091635 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.042813071747018726,0.8175057001256929"
+                                    GradientOrigin="0.042813071747018726,0.8175057001256929"
+                                    RadiusX="0.9929616115052466"
+                                    RadiusY="0.8117382454245395">
+                        <GradientStop Color="#FF0099cc"
+                                Offset="0" />
+                        <GradientStop Color="#FF003568"
+                                Offset="0.9277780055999756" />
+                        <GradientStop Color="#FF003366"
+                                Offset="0.949999988079071" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="8.369,0.621,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="4.404"
+               Width="4.67"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M 8.618328094482422,4.025081634521484 C8.618328094482422,4.025081634521484 11.708536148071289,6.519054412841797 11.708536148071289,6.519054412841797 11.708536148071289,6.519054412841797 13.288734436035156,4.586820602416992 13.288734436035156,4.586820602416992 13.288734436035156,4.586820602416992 12.757492065429688,4.055429458618164 11.856122016906738,3.315974235534668 10.961745262145996,2.5823020935058594 10.229959487915039,2.1148900985717773 10.229959487915039,2.1148900985717773 10.229959487915039,2.1148900985717773 8.618328094482422,4.025081634521484 8.618328094482422,4.025081634521484 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.5311699810261868,0.2591244756232053"
+                                    GradientOrigin="0.5311699810261868,0.2591244756232053"
+                                    RadiusX="0.49560300869019297"
+                                    RadiusY="0.5788496774454529">
+                        <GradientStop Color="#FFc27a72"
+                                Offset="0" />
+                        <GradientStop Color="#FF80340D"
+                                Offset="0.9333329796791077" />
+                        <GradientStop Color="#FF7f330b"
+                                Offset="0.9555559754371643" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="5.935,4.5,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="3.482"
+               Width="3.935"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M 6.812163352966309,5.993573188781738 C6.812163352966309,5.993573188781738 6.1839494705200195,6.777921676635742 6.1839494705200195,6.777921676635742 6.1839494705200195,6.777921676635742 6.947524070739746,7.232476234436035 7.835901260375977,7.975306510925293 8.719582557678223,8.714177131652832 9.381957054138184,9.475302696228027 9.381957054138184,9.475302696228027 9.381957054138184,9.475302696228027 10.11921501159668,8.657419204711914 10.11921501159668,8.657419204711914 10.11921501159668,8.657419204711914 9.420568466186523,7.980251312255859 8.501447677612305,7.22212028503418 7.565184593200684,6.44985294342041 6.812163352966309,5.993573188781738 6.812163352966309,5.993573188781738 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.9697059803583005,0.2890594484912862"
+                                    GradientOrigin="0.9697059803583005,0.2890594484912862"
+                                    RadiusX="0.5364282834670617"
+                                    RadiusY="0.7586126771411669">
+                        <GradientStop Color="#FFcccccc"
+                                Offset="0" />
+                        <GradientStop Color="#FF686868"
+                                Offset="0.9333329796791077" />
+                        <GradientStop Color="#FF666666"
+                                Offset="0.9555559754371643" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="7.812,2.405,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="3.228"
+               Width="3.789"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M 8.530866622924805,3.898571014404297 C8.530866622924805,3.898571014404297 8.061341285705566,4.433980941772461 8.061341285705566,4.433980941772461 8.061341285705566,4.433980941772461 8.838849067687988,4.981285095214844 9.74392318725586,5.693037033081055 10.656047821044922,6.410333633422852 11.378190040588379,7.126607894897461 11.378190040588379,7.126607894897461 11.378190040588379,7.126607894897461 11.849910736083984,6.556713104248047 11.849910736083984,6.556713104248047 11.849910736083984,6.556713104248047 11.032713890075684,5.833953857421875 10.199588775634766,5.140911102294922 9.271937370300293,4.369194984436035 8.530866622924805,3.898571014404297 8.530866622924805,3.898571014404297 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.43447986118925047,0.28248733618880884"
+                                    GradientOrigin="0.43447986118925047,0.28248733618880884"
+                                    RadiusX="0.5308935530282759"
+                                    RadiusY="0.40372149053823364">
+                        <GradientStop Color="#FFcccccc"
+                                Offset="0" />
+                        <GradientStop Color="#FF686868"
+                                Offset="0.9333329796791077" />
+                        <GradientStop Color="#FF666666"
+                                Offset="0.9555559754371643" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="6.71,3.179,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="3.808"
+               Width="4.23"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M 6.95892333984375,5.76214599609375 C6.95892333984375,5.76214599609375 7.862613677978516,4.672874450683594 7.862613677978516,4.672874450683594 7.862613677978516,4.672874450683594 9.588410377502441,5.925745964050293 9.588410377502441,5.925745964050293 9.588410377502441,5.925745964050293 11.188949584960938,7.379446983337402 11.188949584960938,7.379446983337402 11.188949584960938,7.379446983337402 10.28754997253418,8.480874061584473 10.28754997253418,8.480874061584473 10.28754997253418,8.480874061584473 9.755718231201172,8.000542640686035 8.876455307006836,7.2333221435546875 8.004179000854492,6.472166061401367 6.95892333984375,5.76214599609375 6.95892333984375,5.76214599609375 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.5568233057618706,0.276759169912574"
+                                    GradientOrigin="0.5568233057618706,0.276759169912574"
+                                    RadiusX="0.5647990057810927"
+                                    RadiusY="0.7719788210009958">
+                        <GradientStop Color="#FFcccccc"
+                                Offset="0" />
+                        <GradientStop Color="#FF686868"
+                                Offset="0.9333329796791077" />
+                        <GradientStop Color="#FF666666"
+                                Offset="0.9555559754371643" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="0.875,0.756,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="13.438"
+               Width="10.001"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M11.12455,2.9497099 C10.796974,2.7020817 10.224615,2.2496935 10.224615,2.2496935 10.224615,2.2496935 3.2972279,9.9386616 3.2972279,9.9386616 3.2972279,9.9386616 1.1238382,15.688009 1.1238382,15.688009 1.1238382,15.688009 3.925,10.15 3.925,10.15 3.925,10.15 11.144807,2.9650784 11.12455,2.9497099 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.2340284913609595,0.40941221543697837"
+                                    GradientOrigin="0.2340284913609595,0.40941221543697837"
+                                    RadiusX="1.1828655482909158"
+                                    RadiusY="2.5474404245883986">
+                        <GradientStop Color="#FF000000"
+                                Offset="0" />
+                        <GradientStop Color="#00000000"
+                                Offset="0.005555999930948019" />
+                        <GradientStop Color="#14000000"
+                                Offset="0.9055560231208801" />
+                        <GradientStop Color="#16000000"
+                                Offset="0.949999988079071" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="3.199,0.656,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="8.627"
+               Width="10.077"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M10.225209,2.1494628 C10.225209,2.1494628 13.525206,4.6493671 13.525206,4.6493671 13.525206,4.6493671 12.226868,4.0539665 9.625,5.75 7.0231352,7.4460325 6.0014434,11.71711 3.5866861,10.589012 2.3121116,9.9935741 10.225209,2.1494628 10.225209,2.1494628 z">
+                <Path.Fill>
+                    <RadialGradientBrush Center="0.6033051568848984,0.41797103154667026"
+                                    GradientOrigin="0.6033051568848984,0.41797103154667026"
+                                    RadiusX="1.710308509229654"
+                                    RadiusY="1.4486240697822559">
+                        <GradientStop Color="#19ffffff"
+                                Offset="0" />
+                        <GradientStop Color="#7Cffffff"
+                                Offset="0.9611110091209412" />
+                        <GradientStop Color="#7fffffff"
+                                Offset="0.9833329916000366" />
+                    </RadialGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="0.751,0.756,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="13.75"
+               Width="12.574"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M1.9540095,14.851641 C1.9540095,14.851641 3.7059202,10.445454 3.7059202,10.445454 3.7059202,10.445454 10.325357,2.9334286 10.325357,2.9334286 10.325357,2.9334286 12.725009,4.7499978 12.725009,4.7499978 12.725009,4.7499978 5.9621078,12.390781 5.9621078,12.390781 5.9621078,12.390781 1.9540095,14.851641 1.9540095,14.851641 z M13.575486,4.6500827 C13.575486,4.6500827 10.225351,2.2501002 10.225351,2.2501002 10.225351,2.2501002 3.2102799,10.065701 3.2102799,10.065701 3.2102799,10.065701 1,16 1,16 1,16 6.3704149,12.607931 6.3704149,12.607931 6.3704149,12.607931 13.575486,4.6500827 13.575486,4.6500827 z">
+                <Path.Fill>
+                    <LinearGradientBrush StartPoint="0.9663513767662231,-0.10391423000415648"
+                                    EndPoint="0.08183985805967778,0.8771993466412239">
+                        <GradientStop Color="#7fffffff"
+                                Offset="0" />
+                        <GradientStop Color="#00ffffff"
+                                Offset="0.9888889789581299" />
+                    </LinearGradientBrush>
+                </Path.Fill>
+            </Path>
+            <Path Margin="1.362,11.619,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Height="2.025"
+               Width="2.01"
+               Stretch="Fill"
+               Opacity="1"
+               Data="M1.8887157,13.610427 C1.8887157,13.610427 1.1334019,15.475085 1.3031181,15.624239 1.4731229,15.773591 3.2897057,14.507758 3.2897057,14.507758 3.2897057,14.507758 1.8887157,13.610427 1.8887157,13.610427 z"
+               Fill="#000000" />
+        </Grid>
+    </DataTemplate>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/Windows8.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/Windows8.Resources.xaml
new file mode 100644
index 000000000..e89171ae1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/Resources/Windows8.Resources.xaml
@@ -0,0 +1,64 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid">
+
+    <LinearGradientBrush x:Key="errorBackgroundBrush"
+                        EndPoint="0.5,1"
+                        StartPoint="0.5,0">
+        <GradientStop Color="#FFF69898"
+                    Offset="1" />
+        <GradientStop Color="Red" />
+    </LinearGradientBrush>
+
+    <SolidColorBrush x:Key="errorForegroundBrush"
+                    Color="White" />
+
+    <SolidColorBrush x:Key="dropMarkBrush"
+                    Color="#FFC4E5F6" />
+
+    <!-- Pen that is used to draw the drop mark when a ColumnHeader is dragged over another one. -->
+    <Pen x:Key="dropMarkPen"
+        Brush="{StaticResource dropMarkBrush}"
+        Thickness="7" />
+
+    <!--**************************
+    * TEMPLATE: ScrollTip
+    ************************** -->
+    <ControlTemplate x:Key="scrollTipTemplate"
+                    TargetType="{x:Type local:ScrollTip}">
+
+        <Grid VerticalAlignment="{TemplateBinding VerticalAlignment}"
+            HorizontalAlignment="{TemplateBinding HorizontalAlignment}">
+
+            <Border BorderThickness="1,1,1,1"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 Background="{TemplateBinding Background}">
+
+                <ContentPresenter VerticalAlignment="Center"
+                              HorizontalAlignment="Right"
+                              Margin="5"
+                              TextElement.Foreground="{TemplateBinding TextElement.Foreground}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/TableflowView.Windows8.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/TableflowView.Windows8.xaml
new file mode 100644
index 000000000..781e448b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Windows8/TableflowView.Windows8.xaml
@@ -0,0 +1,2141 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<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"
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.DataGrid.Converters"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views"
+                    xmlns:utils="clr-namespace:Xceed.Utils.Wpf.Markup">
+
+    <ResourceDictionary.MergedDictionaries>
+
+        <!-- Include the view independant, color-scheme independant, theme resources -->
+        <ResourceDictionary Source="Resources/Windows8.Resources.xaml" />
+
+        <!-- Include the view dependant, color-scheme independant, theme graphics -->
+        <ResourceDictionary Source="Resources/TableView.Windows8.Graphics.xaml" />
+
+        <!-- Include the standard grid element templates -->
+        <ResourceDictionary Source="../Common/TableflowView.GridElementTemplates.xaml" />
+
+
+    </ResourceDictionary.MergedDictionaries>
+
+    <SolidColorBrush x:Key="warningBackgroundBrush"
+                    Color="#FFC400" />
+
+    <SolidColorBrush x:Key="warningForegroundBrush"
+                    Color="Black" />
+
+    <!-- ****************************************** -->
+    <!-- Windows8 Font                              -->
+    <!-- ****************************************** -->
+
+    <FontFamily x:Key="defaultFontFamily">Segoe UI</FontFamily>
+    <s:Double x:Key="defaultFontSize">12</s:Double>
+
+    <!-- ****************************************** -->
+    <!--  Windows8 Color Scheme                     -->
+    <!-- ****************************************** -->
+
+    <!-- Default -->
+    <SolidColorBrush x:Key="defaultBackgroundBrush"
+                    Color="White" />
+    <SolidColorBrush x:Key="defaultForegroundBrush"
+                    Color="#FF151C55" />
+
+    <!-- DataGridControl -->
+    <SolidColorBrush x:Key="gridBorderBrush"
+                    Color="#FF5284BC" />
+
+    <!-- ColumnManagerCell -->
+    <LinearGradientBrush x:Key="columnManagerCellBackgroundBrush"
+                        StartPoint="0,0"
+                        EndPoint="0,1">
+        <GradientStop Color="#FFF0F0F0"
+                    Offset="0.0" />
+        <GradientStop Color="#FFE5E5E5"
+                    Offset="1.0" />
+    </LinearGradientBrush>
+    <SolidColorBrush x:Key="columnManagerCellMouseOverBackgroundBrush"
+                    Color="#FFBEE6FD" />
+    <SolidColorBrush x:Key="columnManagerCellPressedBackgroundBrush"
+                    Color="#FFC4E5F6" />
+
+    <!-- DataRow -->
+    <SolidColorBrush x:Key="rowBackgroundBrush"
+                    Color="White" />
+    <SolidColorBrush x:Key="rowAlternatingBackgroundBrush"
+                    Color="#FFF7F7F7" />
+    <SolidColorBrush x:Key="rowSelectionBackgroundBrush"
+                    Color="#FFCBE8F6" />
+    <SolidColorBrush x:Key="rowMouseOverBackgroundBrush"
+                    Color="#FFE5F3FB" />
+    <SolidColorBrush x:Key="rowMouseOverSelectionBackgroundBrush"
+                    Color="#FFD1E8FF" />
+    <SolidColorBrush x:Key="rowInactiveSelectionBackgroundBrush"
+                    Color="#FFF7F7F7" />
+
+    <!-- Groups -->
+    <SolidColorBrush x:Key="groupByControlBackgroundBrush"
+                    Color="Gray" />
+    <SolidColorBrush x:Key="groupLevelIndicatorBackgroundBrush"
+                    Color="#FFDFE7F2" />
+    <LinearGradientBrush x:Key="groupHeaderBackgroundBrush"
+                        StartPoint="0,0"
+                        EndPoint="0,1">
+        <GradientStop Color="#FFE9F1FC"
+                    Offset="0.0" />
+        <GradientStop Color="#FFDFE7F2"
+                    Offset="1.0" />
+    </LinearGradientBrush>
+
+
+    <!-- =================================================================== -->
+    <!-- Templates specific to this View/Theme/ColorScheme                   -->
+    <!-- =================================================================== -->
+
+    <!--**************************
+    * TEMPLATE: GroupNavigationControl
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewGroupNavigationControlTemplate"
+                    TargetType="{x:Type local:GroupNavigationControl}">
+
+        <Grid>
+            <Border x:Name="outlineBorder"
+                 Background="Transparent"
+                 BorderBrush="{StaticResource defaultForegroundBrush}"
+                 BorderThickness="1"
+                 CornerRadius="1"
+                 Opacity="0" />
+
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <!-- Button part -->
+                    <ColumnDefinition Width="*" />
+
+                    <!-- Seperator part -->
+                    <ColumnDefinition Width="Auto" />
+
+                    <!-- Toggle button part -->
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <Button x:Name="PART_Button"
+                    Command="local:GroupNavigationButton.NavigateToGroup"
+                    CommandParameter="{TemplateBinding Group}"
+                    Content="{TemplateBinding Group}"
+                    ContentTemplate="{TemplateBinding MainItemTemplate}"
+                    ContentTemplateSelector="{TemplateBinding MainItemTemplateSelector}"
+                    Foreground="{TemplateBinding Foreground}"
+                    Focusable="False"
+                    Grid.Column="0">
+                    <Button.Template>
+                        <ControlTemplate TargetType="{x:Type Button}">
+                            <Border Background="Transparent">
+                                <ContentPresenter Margin="4,2,4,2" />
+                            </Border>
+                        </ControlTemplate>
+                    </Button.Template>
+                </Button>
+
+                <Border x:Name="seperator"
+                    Grid.Column="1"
+                    BorderThickness="0,0,1,0"
+                    BorderBrush="{StaticResource defaultForegroundBrush}"
+                    Margin="0,4,0,4"
+                    Visibility="Hidden" />
+
+                <ToggleButton x:Name="PART_ToggleButton"
+                          Focusable="False"
+                          IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}"
+                          Grid.Column="2"
+                          Foreground="{TemplateBinding Foreground}">
+                    <ToggleButton.Template>
+                        <ControlTemplate>
+                            <Border x:Name="toggleButtonBackground"
+                             CornerRadius="0,6,6,0"
+                             Background="Transparent">
+                                <Path x:Name="Arrow"
+                              Fill="{TemplateBinding Foreground}"
+                              Margin="7,1,7,1"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Data="M 0 0 L 4 4 L 0 8 Z"
+                              Opacity="0.3" />
+                            </Border>
+
+                            <ControlTemplate.Triggers>
+                                <Trigger Property="ToggleButton.IsMouseOver"
+                                 Value="True">
+                                    <Setter TargetName="Arrow"
+                                   Property="Opacity"
+                                   Value="1" />
+                                </Trigger>
+                                <Trigger Property="ToggleButton.IsChecked"
+                                 Value="True">
+                                    <Setter TargetName="Arrow"
+                                   Property="Opacity"
+                                   Value="1" />
+                                    <Setter TargetName="Arrow"
+                                   Property="Margin"
+                                   Value="5,1,5,1" />
+                                    <Setter TargetName="Arrow"
+                                   Property="Data"
+                                   Value="M 0 0 L 4 4 L 8 0 Z" />
+                                </Trigger>
+                            </ControlTemplate.Triggers>
+                        </ControlTemplate>
+                    </ToggleButton.Template>
+                </ToggleButton>
+            </Grid>
+
+            <Popup x:Name="PART_Popup"
+                Placement="Bottom"
+                IsOpen="{TemplateBinding IsDropDownOpen}"
+                AllowsTransparency="True"
+                Focusable="False"
+                PopupAnimation="Slide">
+                <Grid SnapsToDevicePixels="True"
+                  MinWidth="{TemplateBinding ActualWidth}"
+                  MaxHeight="{TemplateBinding MaxDropDownHeight}">
+                    <Border Background="White"
+                       BorderBrush="Black"
+                       BorderThickness="1"
+                       TextElement.Foreground="Black">
+                        <ScrollViewer CanContentScroll="True"
+                                HorizontalScrollBarVisibility="Hidden"
+                                VerticalScrollBarVisibility="Auto">
+                            <!--<ItemsPresenter />-->
+                            <VirtualizingStackPanel IsItemsHost="True" />
+                        </ScrollViewer>
+                    </Border>
+                </Grid>
+            </Popup>
+        </Grid>
+
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                  Value="True">
+                <Setter TargetName="outlineBorder"
+                    Property="Opacity"
+                    Value="1" />
+                <Setter TargetName="seperator"
+                    Property="Visibility"
+                    Value="Visible" />
+            </Trigger>
+
+            <Trigger Property="IsDropDownOpen"
+                  Value="True">
+                <Setter TargetName="outlineBorder"
+                    Property="Opacity"
+                    Value="1" />
+                <Setter TargetName="seperator"
+                    Property="Visibility"
+                    Value="Visible" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                  Value="False">
+                <Setter Property="Opacity"
+                    TargetName="outlineBorder"
+                    Value="0" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: GroupNavigationButton
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewGroupNavigationButtonTemplate"
+                    TargetType="{x:Type local:GroupNavigationButton}">
+        <Grid>
+            <Border x:Name="outerBorder"
+                 BorderBrush="{StaticResource defaultForegroundBrush}"
+                 BorderThickness="1"
+                 CornerRadius="1"
+                 Opacity="0" />
+
+            <ContentPresenter Margin="4,2,4,2" />
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsMouseOver"
+                  Value="True">
+                <Setter Property="Opacity"
+                    TargetName="outerBorder"
+                    Value="1" />
+            </Trigger>
+            <Trigger Property="IsEnabled"
+                  Value="False">
+                <Setter Property="Opacity"
+                    TargetName="outerBorder"
+                    Value="0" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: RowSelector 
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewRowSelectorTemplate"
+                    TargetType="local:RowSelector">
+
+        <!-- This Grid is used to position the resizer Thumb over the RowSelector -->
+        <Grid>
+
+            <Border Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}">
+
+                <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
+                <Grid>
+
+                    <!-- This Border is used to apply the Padding around the ContentPresenter.
+                    We cannot use the ContentPresenter's Margin for this purpose because
+                    the Margin is used to represent the Pressed state. -->
+                    <Border Padding="{TemplateBinding Padding}">
+
+                        <ContentPresenter x:Name="contentPresenter"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                    </Border>
+
+                    <!-- Bottom Line -->
+                    <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Top"
+                          Height="1"
+                          Margin="2,0,2,0" />
+
+                    <!-- Top Line -->
+                    <Rectangle x:Name="bottomBorder"
+                          Fill="LightGray"
+                          HorizontalAlignment="Stretch"
+                          VerticalAlignment="Bottom"
+                          Height="1"
+                          Margin="2,0,2,0" />
+                </Grid>
+            </Border>
+
+            <!-- Thumb that is used to resize the Row. -->
+            <Thumb x:Name="PART_RowResizerThumb"
+                Style="{StaticResource invisibleThumbStyle}"
+                VerticalAlignment="Bottom" />
+
+        </Grid>
+
+        <ControlTemplate.Triggers>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=(views:ViewBase.IsLastItem)}"
+                      Value="True">
+
+                <Setter TargetName="bottomBorder"
+                    Property="Fill"
+                    Value="LightGray" />
+
+            </DataTrigger>
+
+        </ControlTemplate.Triggers>
+
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: ColumnManagerCell 
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewColumnManagerCellTemplate"
+                    TargetType="local:ColumnManagerCell">
+
+        <!-- This Grid is used to position the resizer Thumb over the ColumnManagerCell -->
+        <Grid>
+
+            <Border x:Name="rootBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}">
+
+                <Grid>
+
+                    <Rectangle Fill="LightGray"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
+
+                    <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                          HorizontalAlignment="Right"
+                          VerticalAlignment="Stretch"
+                          Width="1"
+                          Margin="0,2,0,2" />
+
+                    <DockPanel>
+                        <Border x:Name="thumbToggleBackgroundBorder"
+                          DockPanel.Dock="Right">
+
+                            <Grid>
+
+                                <Border x:Name="toggleDelimeterBorder"
+                                BorderBrush="{StaticResource defaultForegroundBrush}"
+                                BorderThickness="1,0,0,0"
+                                Margin="0,4,0,4"
+                                Background="Transparent"
+                                Visibility="Collapsed">
+
+                                    <Border x:Name="toggleDelimeterBorder2"
+                                   BorderBrush="LightGray"
+                                   BorderThickness="1,0,0,0"
+                                   Margin="0,0,0,0"
+                                   Background="Transparent"
+                                   Visibility="Collapsed">
+
+                                    </Border>
+                                </Border>
+
+                                <Border x:Name="borderToggleBackground"
+                                Background="{TemplateBinding Background}"
+                                Margin="1,0,1,0" />
+
+                                <ToggleButton x:Name="toggleButton"
+                                      Focusable="False"
+                                      VerticalAlignment="Stretch"
+                                      Visibility="Collapsed"
+                                      Margin="2,0,0,0"
+                                      Opacity="0.5" />
+
+                            </Grid>
+                        </Border>
+
+                        <Border Background="{TemplateBinding Background}">
+
+                            <!-- This Grid is used to layout the delimiter lines on top of the ContentPresenter -->
+                            <Grid>
+
+                                <Border Padding="{TemplateBinding Padding}">
+
+                                    <Grid x:Name="contentPanel"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+
+                                        <!-- Same ContentPresenter as in the base Cell Template. -->
+                                        <local:CellContentPresenter x:Name="PART_CellContentPresenter"
+                                                          Grid.Column="0" />
+
+                                        <!-- ContentPresenter that is used to display the sort glyph.
+                                      We explicitely set its Content property to Null to prevent the XAML parser
+                                      from implicitely setting it to its TemplatedParent's Content. -->
+                                        <ContentPresenter x:Name="sortGlyphPresenter"
+                                                Content="{x:Null}"
+                                                ContentTemplate="{x:Null}"
+                                                Grid.Column="1" />
+                                    </Grid>
+                                </Border>
+                            </Grid>
+                        </Border>
+                    </DockPanel>
+                </Grid>
+            </Border>
+
+            <!-- Thumb that is used to resize the Column. -->
+            <Thumb x:Name="PART_ColumnResizerThumbLeft"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Left" />
+
+            <!-- Thumb that is used to resize the Column. -->
+            <Thumb x:Name="PART_ColumnResizerThumb"
+                Style="{StaticResource invisibleThumbStyle}"
+                Width="6"
+                HorizontalAlignment="Right" />
+
+        </Grid>
+
+        <ControlTemplate.Triggers>
+
+            <!-- The following triggers allows the content to correctly align to the center when the mouse is over the ColumnManagerCell and the HorizontalContentAlignment is Center -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Value="Visible"
+                          Binding="{Binding ElementName=toggleButton, Path=Visibility}" />
+                    <Condition Value="Center"
+                          Binding="{Binding RelativeSource={RelativeSource Self},
+                        Path=HorizontalContentAlignment}" />
+                </MultiDataTrigger.Conditions>
+
+                <Setter TargetName="PART_CellContentPresenter"
+                    Property="Margin"
+                    Value="16,0,0,0" />
+            </MultiDataTrigger>
+
+            <Trigger Property="IsBeingDragged"
+                  Value="True">
+
+                <Setter TargetName="borderToggleBackground"
+                    Property="Margin"
+                    Value="0,0,1,0" />
+
+            </Trigger>
+
+            <Trigger Property="IsPressed"
+                  Value="True">
+
+                <!-- Change background color of cell when IsPressed -->
+                <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+            </Trigger>
+
+            <!-- Change background color of cell when MouseOver -->
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsMouseOver"
+                          Value="True" />
+                    <Condition Property="IsPressed"
+                          Value="False" />
+                </MultiTrigger.Conditions>
+                <Setter TargetName="rootBorder"
+                    Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+            </MultiTrigger>
+
+            <!-- The following 2 triggers allow the appropriate Sort Glyph to be displayed
+              depending on the ParentColumn's SortDirection. -->
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Ascending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.SortDirection}"
+                      Value="Descending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.HasFixedWidth}"
+                          Value="True" />
+
+                    <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+                    end-user resize. -->
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+                </MultiDataTrigger.Conditions>
+
+                <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+            </MultiDataTrigger>
+
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.PreviousVisibleColumn.HasFixedWidth}"
+                          Value="True" />
+
+                    <!-- Don't disable resizing if ColumnStretching can be disabled by an 
+                    end-user resize. -->
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).RemoveColumnStretchingOnResize}"
+                          Value="False" />
+                </MultiDataTrigger.Conditions>
+
+                <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+            </MultiDataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentRow.AllowColumnResize}"
+                      Value="False">
+                <Setter TargetName="PART_ColumnResizerThumb"
+                    Property="IsEnabled"
+                    Value="False" />
+                <Setter TargetName="PART_ColumnResizerThumbLeft"
+                    Property="IsEnabled"
+                    Value="False" />
+            </DataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=ParentColumn.Visible}"
+                      Value="False">
+                <Setter Property="Visibility"
+                    Value="Collapsed" />
+            </DataTrigger>
+
+        </ControlTemplate.Triggers>
+
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: GroupByItem
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewGroupByItemTemplate"
+                    TargetType="local:GroupByItem">
+
+        <Border x:Name="mainBorder"
+              Background="{TemplateBinding Background}"
+              BorderBrush="{TemplateBinding BorderBrush}"
+              BorderThickness="{TemplateBinding BorderThickness}"
+              Padding="{TemplateBinding Padding}">
+
+            <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
+            <StackPanel Orientation="Horizontal">
+
+                <!-- Same ContentPresenter as in the base Cell Template. -->
+                <ContentPresenter Content="{TemplateBinding Content}"
+                              ContentTemplate="{TemplateBinding ContentTemplate}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                              HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                <!-- ContentPresenter that is used to display the sort glyph.
+                 We explicitely set its Content property to Null to prevent the XAML parser
+                 from implicitely setting it to its TemplatedParent's Content. -->
+                <ContentPresenter x:Name="sortGlyphPresenter"
+                              Content="{x:Null}"
+                              ContentTemplate="{x:Null}"
+                              Margin="15,0,0,0"
+                              TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
+
+            </StackPanel>
+        </Border>
+
+        <ControlTemplate.Triggers>
+
+            <!-- The following 2 triggers allow to display the appropriate Sort Glyph
+              depending on the ParentColumn's SortDirection. -->
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Ascending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Descending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: HierarchicalGroupByControlNode
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewHierarchicalGroupByControlNodeTemplate"
+                    TargetType="local:HierarchicalGroupByControlNode">
+
+        <StackPanel Orientation="Horizontal"
+                  Background="{TemplateBinding Background}">
+
+            <Border BorderBrush="{StaticResource defaultForegroundBrush}"
+                 Background="#55FFFFFF"
+                 BorderThickness="1"
+                 VerticalAlignment="Top"
+                 HorizontalAlignment="Center">
+
+                <TextBlock x:Name="titleTextBlock"
+                       Text="{TemplateBinding Title}"
+                       Margin="3"
+                       FontFamily="{StaticResource defaultFontFamily}"
+                       FontSize="{StaticResource defaultFontSize}" />
+
+            </Border>
+
+            <ItemsPresenter Margin="0,0,0,0" />
+
+        </StackPanel>
+
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: HierarchicalGroupByItem
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewHierarchicalGroupByItemTemplate"
+                    TargetType="local:HierarchicalGroupByItem">
+        <Grid>
+            <Border x:Name="mainBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}">
+
+                <!-- This StackPanel is used to layout the ContentPresenter and the Sort Glyph (when present). -->
+                <StackPanel Orientation="Horizontal">
+
+                    <!-- Same ContentPresenter as in the base Cell Template. -->
+                    <ContentPresenter Content="{TemplateBinding Content}"
+                                 ContentTemplate="{TemplateBinding ContentTemplate}"
+                                 ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                 HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                 VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                    <!-- ContentPresenter that is used to display the sort glyph.
+                 We explicitely set its Content property to Null to prevent the XAML parser
+                 from implicitely setting it to its TemplatedParent's Content. -->
+                    <ContentPresenter x:Name="sortGlyphPresenter"
+                                 Content="{x:Null}"
+                                 ContentTemplate="{x:Null}"
+                                 Margin="15,0,0,0"
+                                 TextBlock.Foreground="{StaticResource defaultForegroundBrush}" />
+
+                </StackPanel>
+            </Border>
+        </Grid>
+        <ControlTemplate.Triggers>
+
+            <!-- The following 2 triggers allow to display the appropriate Sort Glyph
+              depending on the ParentColumn's SortDirection. -->
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Ascending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AscendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=SortDirection}"
+                      Value="Descending">
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="ContentPresenter.ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DescendingSortGlyph}" />
+
+                <Setter TargetName="sortGlyphPresenter"
+                    Property="Margin"
+                    Value="6,0,0,0" />
+
+            </DataTrigger>
+
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: GroupHeaderControl (copied from Office2007Blue)
+    ************************** -->
+    <conv:IntAdditionConverter x:Key="groupHeaderControlGroupLevelConverter" />
+    <ControlTemplate x:Key="tableflowViewGroupHeaderControlTemplate"
+                    TargetType="local:GroupHeaderControl">
+
+        <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
+           defined by the grid's column. -->
+        <views:PassiveLayoutDecorator Axis="Horizontal">
+            <DockPanel>
+
+                <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this GroupHeaderControl is part of a group. -->
+                <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
+                <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
+                                           Indented="False"
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+                <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
+                <Border x:Name="mainBorder"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    Padding="{TemplateBinding Padding}"
+                    Focusable="True"
+                    FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
+
+                    <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
+                    <Border.InputBindings>
+                        <KeyBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                              Key="Space" />
+
+                        <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                              Key="Right" />
+
+                        <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                              Key="Add" />
+
+                        <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                              Key="Left" />
+
+                        <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                              Key="Subtract" />
+
+                        <MouseBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                                MouseAction="LeftDoubleClick" />
+
+                    </Border.InputBindings>
+
+                    <DockPanel>
+
+                        <!-- ToggleButton that is used to expand/collapse the group. -->
+                        <ToggleButton DockPanel.Dock="Left"
+                                OverridesDefaultStyle="True"
+                                Template="{StaticResource groupExpanderToggleButtonTemplate}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Focusable="False"
+                                IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
+
+                        <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is a Group by default. -->
+                        <ContentPresenter DockPanel.Dock="Left"
+                                    Margin="3,0,0,0"
+                                    Content="{TemplateBinding Content}"
+                                    ContentTemplate="{TemplateBinding ContentTemplate}"
+                                    ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                        <!-- Line that is traced across the GroupHeader, following the content -->
+                        <Rectangle Fill="{StaticResource defaultForegroundBrush}"
+                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                             HorizontalAlignment="Stretch"
+                             Height="1"
+                             Margin="7,0,0,0" />
+                    </DockPanel>
+                </Border>
+            </DockPanel>
+        </views:PassiveLayoutDecorator>
+
+        <ControlTemplate.Triggers>
+            <Trigger Property="local:DataGridControl.NavigationBehavior"
+                  Value="None">
+                <Setter TargetName="mainBorder"
+                    Property="Focusable"
+                    Value="False" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: GroupHeaderControl (When top level sticky)
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewGroupHeaderTopLevelStickyControlTemplate"
+                    TargetType="local:GroupHeaderControl">
+
+        <!-- Using this decorator will prevent the GroupHeaderControl of exceeding the width 
+           defined by the grid's column. -->
+        <views:PassiveLayoutDecorator Axis="Horizontal">
+            <!-- This DockPanel is used to layout the GroupLevelIndicatorPane placeholder and the GroupHeaderControl Content. -->
+            <DockPanel>
+
+                <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+              whenever this GroupHeaderControl is part of a group. -->
+                <local:HierarchicalGroupLevelIndicatorPane DockPanel.Dock="Left" />
+                <local:GroupLevelIndicatorPane DockPanel.Dock="Left"
+                                           Indented="False"
+                                           local:GroupLevelIndicatorPane.GroupLevel="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=(local:GroupLevelIndicatorPane.GroupLevel), Converter={StaticResource groupHeaderControlGroupLevelConverter}, ConverterParameter=-1}" />
+
+                <Grid>
+                    <Border Background="{StaticResource groupHeaderBackgroundBrush}" />
+
+                    <!-- Main Border for the GroupHeaderControl. It is Focusable to make the InputBindings work. -->
+                    <Border x:Name="mainBorder"
+                       Background="Transparent"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Focusable="True"
+                       FocusVisualStyle="{TemplateBinding FocusVisualStyle}">
+
+                        <!-- Define all the standard InputBindings for a GroupHeaderControl. -->
+                        <Border.InputBindings>
+                            <KeyBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                                 Key="Space" />
+
+                            <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                                 Key="Right" />
+
+                            <KeyBinding Command="{x:Static local:DataGridCommands.ExpandGroup}"
+                                 Key="Add" />
+
+                            <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                                 Key="Left" />
+
+                            <KeyBinding Command="{x:Static local:DataGridCommands.CollapseGroup}"
+                                 Key="Subtract" />
+
+                            <MouseBinding Command="{x:Static local:DataGridCommands.ToggleGroupExpansion}"
+                                   MouseAction="LeftDoubleClick" />
+
+                        </Border.InputBindings>
+
+                        <DockPanel>
+
+                            <!-- ToggleButton that is used to expand/collapse the group. -->
+                            <ToggleButton DockPanel.Dock="Left"
+                                   OverridesDefaultStyle="True"
+                                   Template="{StaticResource groupExpanderToggleButtonTemplate}"
+                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                   Focusable="False"
+                                   IsChecked="{Binding RelativeSource={RelativeSource TemplatedParent},Path=Group.IsExpanded}" />
+
+                            <!-- ContentPresenter in charge of displaying this GroupHeaderControl's Content, which is
+                    a Group by default. -->
+                            <ContentPresenter DockPanel.Dock="Left"
+                                       Margin="3,0,0,0"
+                                       Content="{TemplateBinding Content}"
+                                       ContentTemplate="{TemplateBinding ContentTemplate}"
+                                       ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </DockPanel>
+                    </Border>
+                </Grid>
+            </DockPanel>
+        </views:PassiveLayoutDecorator>
+
+        <ControlTemplate.Triggers>
+            <Trigger Property="local:DataGridControl.NavigationBehavior"
+                  Value="None">
+                <Setter TargetName="mainBorder"
+                    Property="Focusable"
+                    Value="False" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: ColumnManagerRow (copied from Common)
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewColumnManagerRowTemplate"
+                    TargetType="local:ColumnManagerRow">
+
+        <!-- A basic Row Template requires at least a Panel named "PART_CellsHost" to which the Row's cells will be added.
+           This Panel is usually placed inside a Border who is responsible for painting the gridlines. -->
+
+        <ControlTemplate.Resources>
+            <conv:ThicknessConverter x:Key="thicknessConverter"
+                                  InverseValue="True" />
+        </ControlTemplate.Resources>
+
+        <!-- This Grid is used to layout the GroupLevelIndicatorPane placeholder and the CellsHost panel. -->
+        <Grid x:Name="rootGrid">
+            <Grid.ColumnDefinitions>
+                <!-- HierarchicalGroupLevelIndicatorPane -->
+                <ColumnDefinition Width="Auto" />
+                <!-- GroupLevelIndicatorPane -->
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
+
+                <!-- CellsHost panel -->
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <!-- The border responsible for the visual outline of the row (gridlines and background)
+                       spans the GroupLevelIndicatorPane and CellsHost Panel. Those 2 elements are not children of
+                       the Border because we don't want the border to be displayed in the GroupLevelIndicatorPane. -->
+            <Border x:Name="rootBorder"
+                 Grid.Column="1"
+                 Grid.ColumnSpan="3"
+                 views:TableView.CanScrollHorizontally="False"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{TemplateBinding BorderThickness}"
+                 Padding="{TemplateBinding Padding}" />
+
+            <!-- GroupLevelIndicatorPane is a placeholder for individual GroupLevelIndicator elements that are added
+                       whenever this Row is part of a group. -->
+            <local:HierarchicalGroupLevelIndicatorPane views:TableView.CanScrollHorizontally="False"
+                                                    Grid.Column="0"
+                                                    Background="{TemplateBinding Background}" />
+            <local:GroupLevelIndicatorPane x:Name="groupLevelIndicatorPane"
+                                        views:TableView.CanScrollHorizontally="False"
+                                        Grid.Column="1"
+                                        Background="{TemplateBinding Background}" />
+
+            <!-- ToggleButton that is used to expand/collapse the group. -->
+            <Button x:Name="detailsToggle"
+                 Template="{StaticResource detailsExpanderButtonTemplate}"
+                 VerticalAlignment="Top"
+                 Grid.Column="2"
+                 Margin="2,4,2,0"
+                 Command="{x:Static local:DataGridCommands.ToggleDetailExpansion}"
+                 OverridesDefaultStyle="True"
+                 Focusable="False"
+                 Visibility="Collapsed"
+                 views:TableView.CanScrollHorizontally="False" />
+
+            <Decorator x:Name="indentationDecorator"
+                    Grid.Column="3">
+
+                <!-- The PART_CellsHost part designates the Panel to which this Row's Cells should be added.-->
+                <views:FixedCellPanel x:Name="PART_CellsHost"
+                                  ColumnStretchMinWidth="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMinWidth}"
+                                  ColumnStretchMode="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ColumnStretchMode}"
+                                  FixedCellCount="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnCount, Mode=TwoWay}"
+                                  FixedColumnDropMarkPen="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).FixedColumnDropMarkPen}"
+                                  Margin="{TemplateBinding BorderThickness}" />
+            </Decorator>
+
+        </Grid>
+
+        <ControlTemplate.Triggers>
+
+            <!-- When there are details, display the Toggle button for the expansion, collapsing of the details -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
+                          Value="True" />
+
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AllowDetailToggle}"
+                          Value="True" />
+
+                </MultiDataTrigger.Conditions>
+
+                <Setter TargetName="detailsToggle"
+                    Property="Visibility"
+                    Value="Hidden" />
+
+            </MultiDataTrigger>
+
+        </ControlTemplate.Triggers>
+
+    </ControlTemplate>
+
+    <!--**************************
+    * TEMPLATE: GroupLevelIndicatorPane (copied from common)
+    ************************** -->
+    <ControlTemplate x:Key="tableflowViewGroupLevelIndicatorPaneTemplate"
+                    TargetType="local:GroupLevelIndicatorPane">
+        <Grid>
+
+            <Border x:Name="horizontalBorder"
+                 Background="{TemplateBinding Background}"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 BorderThickness="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HorizontalGridLineThickness, Converter={StaticResource thicknessConverter}, ConverterParameter='Top, Bottom'}" />
+
+            <Border x:Name="verticalBorder"
+                 BorderBrush="{TemplateBinding BorderBrush}"
+                 Padding="{TemplateBinding Padding}"
+                 BorderThickness="0">
+                <StackPanel x:Name="PART_GroupLevelIndicatorHost"
+                        Orientation="Horizontal" />
+            </Border>
+
+        </Grid>
+        <ControlTemplate.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+
+                    <Condition Property="CurrentIndicatorCount"
+                          Value="0" />
+
+                    <Condition Property="IsLeaf"
+                          Value="False" />
+                </MultiTrigger.Conditions>
+
+                <Setter TargetName="verticalBorder"
+                    Property="BorderThickness"
+                    Value="0" />
+            </MultiTrigger>
+
+            <Trigger Property="ShowVerticalBorder"
+                  Value="False">
+                <Setter TargetName="verticalBorder"
+                    Property="BorderThickness"
+                    Value="0" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <!-- =================================================================== -->
+    <!-- Styles required by some grid elements                               -->
+    <!-- =================================================================== -->
+
+
+    <!--**************************
+    * STYLE: CellErrorStyle 
+    ************************** -->
+    <Style x:Key="cellErrorStyle"
+          TargetType="local:Cell">
+
+        <Setter Property="Background"
+              Value="{StaticResource errorBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource errorForegroundBrush}" />
+
+        <Setter Property="ToolTip"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=ValidationError.ErrorContent}" />
+
+        <Style.Triggers>
+            <Trigger Property="IsValidationErrorRestrictive"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource errorBackgroundBrush}" />
+
+            </Trigger>
+
+            <Trigger Property="IsValidationErrorRestrictive"
+                  Value="False">
+
+                <Setter Property="Foreground"
+                    Value="{StaticResource warningForegroundBrush}" />
+
+                <Setter Property="Background"
+                    Value="{StaticResource warningBackgroundBrush}" />
+
+            </Trigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <!-- =================================================================== -->
+    <!-- Keyed Styles of grid elements                                       -->
+    <!-- =================================================================== -->
+
+    <!--**************************
+    * STYLE: DataGridControl 
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GridControlStyle"
+          TargetType="local:DataGridControl">
+
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource gridBorderBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="1" />
+
+        <Setter Property="Background"
+              Value="{StaticResource defaultBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <!-- This is required to display gridlines of uniform thickness -->
+        <Setter Property="SnapsToDevicePixels"
+              Value="True" />
+
+        <Setter Property="CellErrorStyle"
+              Value="{StaticResource cellErrorStyle}" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewDataGridControlTemplate}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: RowSelectorPane
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8RowSelectorPaneStyle"
+          TargetType="local:RowSelectorPane">
+
+        <!-- same background as the ColumnManagerCells -->
+        <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+        <Setter Property="TextElement.Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: RowSelector 
+    ************************** -->
+    <conv:TypeToBooleanConverter x:Key="rowTypeConverter" />
+    <Style x:Key="tableflowViewWindows8RowSelectorStyle"
+          TargetType="local:RowSelector">
+
+        <!-- Set the RowSelector's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying RowSelectorPane. -->
+        <Setter Property="Background"
+              Value="Transparent" />
+
+        <Setter Property="HorizontalContentAlignment"
+              Value="Center" />
+
+        <Setter Property="VerticalContentAlignment"
+              Value="Top" />
+
+        <Setter Property="Padding"
+              Value="2" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewRowSelectorTemplate}" />
+
+        <Style.Triggers>
+
+            <!-- We have to use triggers on the type of the Row associated with this 
+              RowSelector instead of assigning a value to RowSelector.RowSelectorStyle 
+              on each row type. This is to avoid a custom RowSelector.RowSelectorStyle
+              set by a client of the DataGridControl to completely override the 
+              RowSelector style (DefaultStyleKey). -->
+
+            <!-- When the Row is Current, display the current glyph in the RowSelector -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsCurrent}"
+                          Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).CurrentItemGlyph}" />
+            </MultiDataTrigger>
+
+            <!-- When the Row is being edited, display the appropriate glyph in the RowSelector. -->
+            <Trigger Property="IsBeingEdited"
+                  Value="True">
+                <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).EditingRowGlyph}" />
+
+            </Trigger>
+
+            <!-- When the Row has a validation error, display the appropriate glyph in the RowSelector. -->
+            <Trigger Property="HasValidationError"
+                  Value="True">
+                <Setter Property="ContentTemplate"
+                    Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ValidationErrorGlyph}" />
+            </Trigger>
+
+            <!-- Use default Button States colors on the RowSelector -->
+            <Trigger Property="IsMouseOver"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+            </Trigger>
+
+        </Style.Triggers>
+    </Style>
+
+    <!--**************************
+    * STYLE: Row Style
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8RowStyle"
+          TargetType="local:Row">
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="FocusVisualStyle"
+              Value="{StaticResource tableflowViewRowFocusVisualStyle}" />
+
+        <Setter Property="SelectionBackground"
+              Value="{StaticResource rowSelectionBackgroundBrush}" />
+
+        <Setter Property="SelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="InactiveSelectionBackground"
+              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
+
+        <Setter Property="InactiveSelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="0" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewRowTemplate}" />
+
+        <Setter Property="Background"
+              Value="{StaticResource rowBackgroundBrush}" />
+
+        <Style.Triggers>
+
+            <!-- Enabled/Disabled Odd datarow style alternation -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).IsAlternatingRowStyleEnabled}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridVirtualizingPanel.ItemIndex), Converter={x:Static conv:IndexToOddConverter.Singleton}}"
+                          Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Background"
+                    Value="{StaticResource rowAlternatingBackgroundBrush}" />
+            </MultiDataTrigger>
+
+        </Style.Triggers>
+    </Style>
+
+    <!--**************************
+    * STYLE: DataRow 
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8DataRowStyle"
+          TargetType="local:DataRow"
+          BasedOn="{StaticResource tableflowViewWindows8RowStyle}">
+
+        <Style.Triggers>
+            <!-- MouseOver + NotSelected -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Background"
+                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
+            </MultiDataTrigger>
+
+            <!-- MouseOver + Selected -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Row" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="SelectionBackground"
+                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
+            </MultiDataTrigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: ColumnManagerRow
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8ColumnManagerRowStyle"
+          TargetType="local:ColumnManagerRow"
+          BasedOn="{StaticResource tableflowViewWindows8RowStyle}">
+
+        <!-- Use a different background and foreground than the base Row style. -->
+        <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="0,1,0,1" />
+
+        <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="Padding"
+              Value="12" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewColumnManagerRowTemplate}" />
+
+        <Style.Triggers>
+
+            <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
+                  Value="-1">
+                <!-- We don't want to display the Group Margins for the ColumnManagerRow. -->
+                <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+                    Value="False" />
+            </Trigger>
+
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: Cell Style
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8CellStyle"
+          TargetType="local:Cell">
+
+        <Setter Property="CurrentBackground"
+              Value="{StaticResource defaultBackgroundBrush}" />
+
+        <Setter Property="CurrentForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="SelectionBackground"
+              Value="{StaticResource rowSelectionBackgroundBrush}" />
+
+        <Setter Property="SelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="InactiveSelectionBackground"
+              Value="{StaticResource rowInactiveSelectionBackgroundBrush}" />
+
+        <Setter Property="InactiveSelectionForeground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <!-- Set the Cell's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying Row. -->
+        <Setter Property="Background"
+              Value="Transparent" />
+
+        <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
+        <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
+
+        <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+        <!-- The Cell is responsible for drawing the vertical gridlines. It draws only its right gridline, 
+           assuming that the left gridline will have been drawn by its preceding cell -->
+
+        <Setter Property="BorderThickness"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).VerticalGridLineThickness,Converter={StaticResource thicknessConverter},ConverterParameter='Right'}" />
+
+        <Setter Property="BorderBrush"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).VerticalGridLineBrush}" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewCellTemplate}" />
+    </Style>
+
+    <!--**************************
+    * STYLE: DataCell
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8DataCellStyle"
+          TargetType="local:DataCell"
+          BasedOn="{StaticResource tableflowViewWindows8CellStyle}">
+
+        <Style.Triggers>
+            <!-- MouseOver + NotSelected -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Cell" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="False" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="Background"
+                    Value="{StaticResource rowMouseOverBackgroundBrush}" />
+            </MultiDataTrigger>
+
+            <!-- MouseOver + Selected -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self},Path=(local:DataGridControl.DataGridContext).DataGridControl.SelectionUnit}"
+                          Value="Cell" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsSelected}"
+                          Value="True" />
+                </MultiDataTrigger.Conditions>
+                <Setter Property="SelectionBackground"
+                    Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
+            </MultiDataTrigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: ColumnManagerCell
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8ColumnManagerCellStyle"
+          TargetType="local:ColumnManagerCell">
+
+        <!-- Set the Cell's background to Transparent to make it hit-testable
+           while preserving the background drawn by the underlying Row. -->
+        <Setter Property="Background"
+              Value="Transparent" />
+
+        <!-- In TableflowView, each Cell has the same width as its ParentColum's ActualWidth -->
+        <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self},Path=ParentColumn.ActualWidth}" />
+
+        <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+        <Setter Property="HorizontalContentAlignment"
+              Value="Left" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewColumnManagerCellTemplate}" />
+
+        <Style.Triggers>
+
+            <Trigger Property="IsBeingDragged"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+            </Trigger>
+
+        </Style.Triggers>
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupByControl
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupByControlStyle"
+          TargetType="local:GroupByControl">
+
+        <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
+           the control with a Height of 0, which makes it invisible and unusable.
+           In a typical TableflowView, a height of at least 25 is appropriate for the GroupByControl. -->
+        <Setter Property="MinHeight"
+              Value="25" />
+
+        <Setter Property="Background"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="Padding"
+              Value="8" />
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="1,1,1,0" />
+
+        <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+        <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupByControlTemplate}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupByItem
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupByItemStyle"
+          TargetType="local:GroupByItem">
+
+        <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupByItemTemplate}" />
+
+        <!-- Use default Button States colors on the GroupByItems -->
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+            </Trigger>
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupHeaderControl
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupHeaderControlStyle"
+          TargetType="local:GroupHeaderControl">
+
+        <Setter Property="Background"
+              Value="Transparent" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+        <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+        <Setter Property="VerticalContentAlignment"
+              Value="Center" />
+
+        <!-- The GroupHeaderControl itself must not be focusable. The main Border inside its Template will
+           be made Focusable because it is holding the various InputBindings that make the
+           GroupHeaderControl work. -->
+        <Setter Property="Focusable"
+              Value="False" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupHeaderControlTemplate}" />
+
+        <Style.Triggers>
+
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Content.IsBottomLevel}"
+                          Value="False" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=Content.Level}"
+                          Value="0" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AreGroupHeadersSticky}"
+                          Value="True" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).AreGroupsFlattened}"
+                          Value="True" />
+                </MultiDataTrigger.Conditions>
+
+                <Setter Property="Template"
+                    Value="{StaticResource tableflowViewGroupHeaderTopLevelStickyControlTemplate}" />
+
+            </MultiDataTrigger>
+
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupLevelIndicator
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupLevelIndicatorStyle"
+          TargetType="local:GroupLevelIndicator">
+
+        <Setter Property="Background"
+              Value="White" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="0" />
+
+        <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).GroupLevelIndicatorWidth}" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupLevelIndicatorTemplate}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: DetailIndicator
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8DetailIndicatorStyle"
+          TargetType="local:DetailIndicator">
+
+        <Setter Property="Background"
+              Value="{x:Null}" />
+
+        <Setter Property="Width"
+              Value="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).DetailIndicatorWidth}" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewDetailIndicatorTemplate}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupLevelIndicatorPane
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupLevelIndicatorPaneStyle"
+          TargetType="local:GroupLevelIndicatorPane">
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupLevelIndicatorPaneTemplate}" />
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Style.Triggers>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="IsLeaf"
+                          Value="False" />
+                    <Condition Property="views:ViewBase.IsLastItem"
+                          Value="True" />
+                </MultiTrigger.Conditions>
+
+                <Setter Property="Margin"
+                    Value="0,0,0,-5" />
+            </MultiTrigger>
+
+        </Style.Triggers>
+    </Style>
+
+    <!--**************************
+    * STYLE: HierarchicalGroupLevelIndicatorPane
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8HierarchicalGroupLevelIndicatorPaneStyle"
+          TargetType="local:HierarchicalGroupLevelIndicatorPane">
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewHierarchicalGroupLevelIndicatorPaneTemplate}" />
+
+        <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+              Value="True" />
+
+        <Setter Property="local:GroupLevelIndicatorPane.ShowVerticalBorder"
+              Value="True" />
+
+        <Style.Triggers>
+            <Trigger Property="local:GroupLevelIndicatorPane.GroupLevel"
+                  Value="-1">
+
+                <!-- Stop the propagation of the value set by the default style trigger of
+                 the ColumnManagerRow -->
+                <Setter Property="local:GroupLevelIndicatorPane.ShowIndicators"
+                    Value="True" />
+
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+    <!--**************************
+    * STYLE: HierarchicalGroupByControlNode
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8HierarchicalGroupByControlNodeStyle"
+          TargetType="local:HierarchicalGroupByControlNode">
+
+        <Setter Property="StairHeight"
+              Value="0" />
+
+        <Setter Property="ConnectionLineOffset"
+              Value="0" />
+
+        <Setter Property="ConnectionLineAlignment"
+              Value="CenterToCenter" />
+
+        <Setter Property="Focusable"
+              Value="False" />
+
+        <Setter Property="Margin"
+              Value="4" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewHierarchicalGroupByControlNodeTemplate}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: HierarchicalGroupByControl
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8HierarchicalGroupByControlStyle"
+          TargetType="local:HierarchicalGroupByControl">
+
+        <!-- If we don't specify a MinHeight, the default "size-to-content" behavior will arrange 
+           the control with a Height of 0, which makes it invisible and unusable.
+           In a typical TableflowView, a height of at least 25 is appropriate for the GroupByControl. -->
+        <Setter Property="MinHeight"
+              Value="25" />
+
+        <Setter Property="Background"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="Padding"
+              Value="8" />
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource groupByControlBackgroundBrush}" />
+
+        <Setter Property="BorderThickness"
+              Value="1,1,1,0" />
+
+        <Setter Property="StairHeight"
+              Value="0" />
+
+        <Setter Property="ConnectionLineOffset"
+              Value="0" />
+
+        <Setter Property="ConnectionLineAlignment"
+              Value="CenterToCenter" />
+
+        <Setter Property="local:RowSelector.Visible"
+              Value="False" />
+
+        <Setter Property="views:TableView.CanScrollHorizontally"
+              Value="False" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewCommonHierarchicalGroupByControlTemplate}" />
+
+        <Style.Triggers>
+
+            <!-- We use the old GroupByControl Template if there are no Details in the DataGridControl.ItemsSource -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).HasDetails}"
+                          Value="False" />
+
+                    <Condition Binding="{Binding RelativeSource={RelativeSource Self}, Path=(local:DataGridControl.DataGridContext).ParentDataGridContext, Converter={StaticResource nullToBooleanConverter}}"
+                          Value="True" />
+
+                </MultiDataTrigger.Conditions>
+
+                <Setter Property="Template"
+                    Value="{StaticResource tableflowViewCommonHierarchicalGroupByControlOldGroupByControlTemplate}" />
+
+            </MultiDataTrigger>
+
+        </Style.Triggers>
+
+    </Style>
+
+    <!--**************************
+    * STYLE: HierarchicalGroupByItem
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8HierarchicalGroupByItemStyle"
+          TargetType="local:HierarchicalGroupByItem">
+
+        <Setter Property="Background"
+              Value="{StaticResource columnManagerCellBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="FontFamily"
+              Value="{StaticResource defaultFontFamily}" />
+
+        <Setter Property="FontSize"
+              Value="{StaticResource defaultFontSize}" />
+
+        <Setter Property="Padding"
+              Value="{StaticResource cellPadding}" />
+
+        <Setter Property="Margin"
+              Value="4,0,4,0" />
+
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewHierarchicalGroupByItemTemplate}" />
+
+        <!-- Use default Button States colors on the HierarchicalGroupByItems -->
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellMouseOverBackgroundBrush}" />
+            </Trigger>
+            <Trigger Property="IsPressed"
+                  Value="True">
+                <Setter Property="Background"
+                    Value="{StaticResource columnManagerCellPressedBackgroundBrush}" />
+            </Trigger>
+        </Style.Triggers>
+
+    </Style>
+
+
+    <!--**************************
+    * STYLE: ScrollTip
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8ScrollTipStyle"
+          TargetType="local:ScrollTip">
+
+        <Setter Property="Template"
+              Value="{StaticResource scrollTipTemplate}" />
+
+        <Setter Property="VerticalAlignment"
+              Value="Center" />
+
+        <Setter Property="HorizontalAlignment"
+              Value="Right" />
+
+        <Setter Property="Background"
+              Value="{StaticResource groupHeaderBackgroundBrush}" />
+
+        <Setter Property="Foreground"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+        <Setter Property="BorderBrush"
+              Value="{StaticResource defaultForegroundBrush}" />
+
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupNavigationControl
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupNavigationControlStyle"
+          TargetType="local:GroupNavigationControl">
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupNavigationControlTemplate}" />
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupNavigationControlItem
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupNavigationControlItemStyle"
+          TargetType="{x:Type local:GroupNavigationControlItem}">
+
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:GroupNavigationControlItem}">
+                    <Grid SnapsToDevicePixels="true">
+                        <Border x:Name="Border"
+                          Background="Transparent" />
+                        <Border Margin="2">
+                            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                       VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <!-- Change IsSelected SelectedBackgroundBrush to set the selection color for the items -->
+                        <Trigger Property="IsMouseOver"
+                           Value="true">
+                            <Setter Property="Background"
+                             TargetName="Border"
+                             Value="{StaticResource rowMouseOverSelectionBackgroundBrush}" />
+
+                            <Setter Property="Foreground"
+                             Value="Black" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled"
+                           Value="false">
+                            <Setter Property="Foreground"
+                             Value="Gray" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!--**************************
+    * STYLE: GroupNavigationButton
+    ************************** -->
+    <Style x:Key="tableflowViewWindows8GroupNavigationButtonStyle"
+          TargetType="local:GroupNavigationButton">
+        <Setter Property="Template"
+              Value="{StaticResource tableflowViewGroupNavigationButtonTemplate}" />
+    </Style>
+
+    <!-- =================================================================== -->
+    <!-- Default values for the View                                         -->
+    <!-- =================================================================== -->
+
+    <Style x:Key="tableflowViewWindows8DefaultValues"
+          TargetType="views:TableflowView">
+
+        <Setter Property="HorizontalGridLineBrush"
+              Value="{StaticResource gridLineBrush}" />
+
+        <Setter Property="HorizontalGridLineThickness"
+              Value="1" />
+
+        <Setter Property="GroupLevelIndicatorWidth"
+              Value="17" />
+
+        <Setter Property="DetailIndicatorWidth"
+              Value="34" />
+
+        <Setter Property="ContainerHeight"
+              Value="30" />
+
+        <Setter Property="DefaultDropMarkPen"
+              Value="{StaticResource dropMarkPen}" />
+
+        <!-- Those glyphs are null by default on ViewBase, so every Theme should define
+           and set their own custom glyphs. -->
+
+        <Setter Property="AscendingSortGlyph"
+              Value="{StaticResource ascendingSortGlyph}" />
+
+        <Setter Property="DescendingSortGlyph"
+              Value="{StaticResource descendingSortGlyph}" />
+
+        <Setter Property="ExpandGroupGlyph"
+              Value="{StaticResource expandGroupGlyph}" />
+
+        <Setter Property="CollapseGroupGlyph"
+              Value="{StaticResource collapseGroupGlyph}" />
+
+        <Setter Property="CurrentItemGlyph"
+              Value="{StaticResource currentItemGlyph}" />
+
+        <Setter Property="EditingRowGlyph"
+              Value="{StaticResource editingRowGlyph}" />
+
+        <Setter Property="ValidationErrorGlyph"
+              Value="{StaticResource validationErrorGlyph}" />
+
+        <Setter Property="ConnectionStateLoadingGlyph"
+              Value="{StaticResource connectionStateLoadingGlyph}" />
+
+        <Setter Property="ConnectionStateCommittingGlyph"
+              Value="{StaticResource connectionStateLoadingGlyph}" />
+
+        <Setter Property="ConnectionStateErrorGlyph"
+              Value="{StaticResource connectionStateErrorGlyph}" />
+
+    </Style>
+
+    <!-- =================================================================== -->
+    <!-- DefaultStyleKey declarations                                        -->
+    <!-- =================================================================== -->
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme}"
+          TargetType="views:TableflowView"
+          BasedOn="{StaticResource tableflowViewWindows8DefaultValues}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataGridControl}"
+          TargetType="local:DataGridControl"
+          BasedOn="{StaticResource tableflowViewWindows8GridControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelectorPane}"
+          TargetType="local:RowSelectorPane"
+          BasedOn="{StaticResource tableflowViewWindows8RowSelectorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:RowSelector}"
+          TargetType="local:RowSelector"
+          BasedOn="{StaticResource tableflowViewWindows8RowSelectorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:Row}"
+          TargetType="local:Row"
+          BasedOn="{StaticResource tableflowViewWindows8RowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataRow}"
+          TargetType="local:DataRow"
+          BasedOn="{StaticResource tableflowViewWindows8DataRowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerRow}"
+          TargetType="local:ColumnManagerRow"
+          BasedOn="{StaticResource tableflowViewWindows8ColumnManagerRowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:Cell}"
+          TargetType="local:Cell"
+          BasedOn="{StaticResource tableflowViewWindows8CellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DataCell}"
+          TargetType="local:DataCell"
+          BasedOn="{StaticResource tableflowViewWindows8DataCellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ColumnManagerCell}"
+          TargetType="local:ColumnManagerCell"
+          BasedOn="{StaticResource tableflowViewWindows8ColumnManagerCellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByControl}"
+          TargetType="local:GroupByControl"
+          BasedOn="{StaticResource tableflowViewWindows8GroupByControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupByItem}"
+          TargetType="local:GroupByItem"
+          BasedOn="{StaticResource tableflowViewWindows8GroupByItemStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupHeaderControl}"
+          TargetType="local:GroupHeaderControl"
+          BasedOn="{StaticResource tableflowViewWindows8GroupHeaderControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicator}"
+          TargetType="local:GroupLevelIndicator"
+          BasedOn="{StaticResource tableflowViewWindows8GroupLevelIndicatorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:DetailIndicator}"
+          TargetType="local:DetailIndicator"
+          BasedOn="{StaticResource tableflowViewWindows8DetailIndicatorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupLevelIndicatorPane}"
+          TargetType="local:GroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableflowViewWindows8GroupLevelIndicatorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
+          TargetType="local:HierarchicalGroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupLevelIndicatorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:ScrollTip}"
+          TargetType="local:ScrollTip"
+          BasedOn="{StaticResource tableflowViewWindows8ScrollTipStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControlNode}"
+          TargetType="local:HierarchicalGroupByControlNode"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByControlNodeStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByControl}"
+          TargetType="local:HierarchicalGroupByControl"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:HierarchicalGroupByItem}"
+          TargetType="local:HierarchicalGroupByItem"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByItemStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationButton}"
+          TargetType="local:GroupNavigationButton"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationButtonStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationControl}"
+          TargetType="local:GroupNavigationControl"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, ThemeType=views:Windows8Theme, TargetElementType=local:GroupNavigationControlItem}"
+          TargetType="local:GroupNavigationControlItem"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationControlItemStyle}" />
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/TableView.Zune.Graphics.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/TableView.Zune.Graphics.xaml
index 6038c4ad2..d04e009c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/TableView.Zune.Graphics.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/TableView.Zune.Graphics.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.Resources.xaml
index fdcffb726..5299c9275 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
index 108993ca5..9bc51f8e6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/Resources/Zune.normalcolor.Resources.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
index 4be426a08..8cf416efd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableView.Zune.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
index 20dce6193..80822a0ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/Zune/TableflowView.Zune.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
index 546fdd3fa..e286b3f52 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
new file mode 100644
index 000000000..679bc3a66
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/aero2.normalcolor.xaml
@@ -0,0 +1,137 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.DataGrid"
+                    xmlns:markup="clr-namespace:Xceed.Wpf.DataGrid.Markup"
+                    xmlns:views="clr-namespace:Xceed.Wpf.DataGrid.Views">
+
+    <ResourceDictionary.MergedDictionaries>
+        <!-- Style definitions for specific controls (things that are not grid elements) -->
+
+        <ResourceDictionary Source="/Xceed.Wpf.DataGrid;;;component\themes/Controls/FixedColumnSplitter.generic.xaml"/>
+        <ResourceDictionary Source="/Xceed.Wpf.DataGrid;;;component\themes/Controls/TableViewScrollViewer.generic.xaml"/>
+
+        <!-- For each specific systeme theme ResourceDictionary, we only need to include 
+           the xaml associated to the theme (to make the "BasedOn" work). However, here 
+           we have include all xaml theme files of the product to make the forcing of a 
+           theme work. And it works because, when the DefaultStyleKey is not found in the 
+           specific ResourceDictionary, WPF looks in the generic.xaml ResourceDictionary. 
+           That way, we don't have to maintain this list in all the xaml files. -->
+
+        <ResourceDictionary Source="/Xceed.Wpf.DataGrid;;;component\themes/Windows8/TableflowView.Windows8.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- Generic theme for TableflowView -->
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView}"
+          TargetType="views:TableflowView"
+          BasedOn="{StaticResource tableflowViewWindows8DefaultValues}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataGridControl}"
+          TargetType="local:DataGridControl"
+          BasedOn="{StaticResource tableflowViewWindows8GridControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelectorPane}"
+          TargetType="local:RowSelectorPane"
+          BasedOn="{StaticResource tableflowViewWindows8RowSelectorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:RowSelector}"
+          TargetType="local:RowSelector"
+          BasedOn="{StaticResource tableflowViewWindows8RowSelectorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Row}"
+          TargetType="local:Row"
+          BasedOn="{StaticResource tableflowViewWindows8RowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataRow}"
+          TargetType="local:DataRow"
+          BasedOn="{StaticResource tableflowViewWindows8DataRowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerRow}"
+          TargetType="local:ColumnManagerRow"
+          BasedOn="{StaticResource tableflowViewWindows8ColumnManagerRowStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:Cell}"
+          TargetType="local:Cell"
+          BasedOn="{StaticResource tableflowViewWindows8CellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DataCell}"
+          TargetType="local:DataCell"
+          BasedOn="{StaticResource tableflowViewWindows8DataCellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ColumnManagerCell}"
+          TargetType="local:ColumnManagerCell"
+          BasedOn="{StaticResource tableflowViewWindows8ColumnManagerCellStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByControl}"
+          TargetType="local:GroupByControl"
+          BasedOn="{StaticResource tableflowViewWindows8GroupByControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupByItem}"
+          TargetType="local:GroupByItem"
+          BasedOn="{StaticResource tableflowViewWindows8GroupByItemStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupHeaderControl}"
+          TargetType="local:GroupHeaderControl"
+          BasedOn="{StaticResource tableflowViewWindows8GroupHeaderControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicator}"
+          TargetType="local:GroupLevelIndicator"
+          BasedOn="{StaticResource tableflowViewWindows8GroupLevelIndicatorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:DetailIndicator}"
+          TargetType="local:DetailIndicator"
+          BasedOn="{StaticResource tableflowViewWindows8DetailIndicatorStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupLevelIndicatorPane}"
+          TargetType="local:GroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableflowViewWindows8GroupLevelIndicatorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupLevelIndicatorPane}"
+          TargetType="local:HierarchicalGroupLevelIndicatorPane"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupLevelIndicatorPaneStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:ScrollTip}"
+          TargetType="local:ScrollTip"
+          BasedOn="{StaticResource tableflowViewWindows8ScrollTipStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControlNode}"
+          TargetType="local:HierarchicalGroupByControlNode"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByControlNodeStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByControl}"
+          TargetType="local:HierarchicalGroupByControl"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:HierarchicalGroupByItem}"
+          TargetType="local:HierarchicalGroupByItem"
+          BasedOn="{StaticResource tableflowViewWindows8HierarchicalGroupByItemStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationButton}"
+          TargetType="{x:Type local:GroupNavigationButton}"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationButtonStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControl}"
+          TargetType="{x:Type local:GroupNavigationControl}"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationControlStyle}" />
+
+    <Style x:Key="{markup:ThemeKey TargetViewType=views:TableflowView, TargetElementType=local:GroupNavigationControlItem}"
+          TargetType="{x:Type local:GroupNavigationControlItem}"
+          BasedOn="{StaticResource tableflowViewWindows8GroupNavigationControlItemStyle}" />
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
index 4bc2ce950..7ab4e6291 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/classic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
index 703a83a4f..14b9b2b83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
index 50208d91f..8610113da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.homestead.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
index 386de571d..23de20e47 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.metallic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
index d5f5298b8..5138ae3de 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/luna.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
index 35b7d8448..64913c8d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/royale.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
index c063edbb0..33ae60cc0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.DataGrid/themes/zune.normalcolor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico
new file mode 100644
index 000000000..77e821e75
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.ico differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
new file mode 100644
index 000000000..b48e41158
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
@@ -0,0 +1,29 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+ <Application x:Class="Xceed.Wpf.Toolkit.LiveExplorer.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+
+        <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Resources/TextBlockStyles.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+
+    </Application.Resources>
+</Application>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
new file mode 100644
index 000000000..3facfaefa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
@@ -0,0 +1,32 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Configuration;
+using System.Data;
+using System.Linq;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer
+{
+  /// <summary>
+  /// Interaction logic for App.xaml
+  /// </summary>
+  public partial class App : Application
+  {
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
new file mode 100644
index 000000000..de92277b3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
@@ -0,0 +1,71 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Resources;
+using Xceed.Wpf.Toolkit.LiveExplorer.Core;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer
+{
+  public abstract class CodeBox : Xceed.Wpf.Toolkit.RichTextBox
+  {
+    protected CodeBox()
+    {
+      this.IsReadOnly = true;
+      this.FontFamily = new FontFamily( "Courier New" );
+      this.HorizontalScrollBarVisibility = System.Windows.Controls.ScrollBarVisibility.Auto;
+      this.VerticalScrollBarVisibility = System.Windows.Controls.ScrollBarVisibility.Auto;
+      this.Document.PageWidth = 2500;
+    }
+
+    public string CodeSource
+    {
+      set
+      {
+        if( value == null )
+          this.Text = null;
+
+        this.Text = this.GetDataFromResource( value );
+      }
+    }
+
+    private string GetDataFromResource( string uriString )
+    {
+      Uri uri = new Uri( uriString, UriKind.Relative );
+      StreamResourceInfo info = Application.GetResourceStream( uri );
+
+      StreamReader reader = new StreamReader( info.Stream );
+      string data = reader.ReadToEnd();
+      reader.Close();
+
+      return data;
+    }
+
+  }
+
+  public class XamlBox : CodeBox
+  {
+    public XamlBox() { this.TextFormatter = new Core.XamlFormatter(); }
+  }
+
+  public class CSharpBox : CodeBox
+  {
+    public CSharpBox() { this.TextFormatter = new Core.CSharpFormatter(); }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
new file mode 100644
index 000000000..f5a1c0105
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
@@ -0,0 +1,46 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Windows.Documents;
+using Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
+{
+  /// <summary>
+  /// Formats the RichTextBox text as colored C#
+  /// </summary>
+  public class CSharpFormatter : ITextFormatter
+  {
+    public readonly static CSharpFormatter Instance = new CSharpFormatter();
+
+    public string GetText( FlowDocument document )
+    {
+      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      document.Blocks.Clear();
+      document.PageWidth = 2500;
+
+      CSharpFormat cSharpFormat = new CSharpFormat();
+      Paragraph p = new Paragraph();
+      p = cSharpFormat.FormatCode( text );
+      document.Blocks.Add( p );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs
similarity index 95%
rename from ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs
index d0480e3fb..628e5ba4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/CSharpFormat.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright © 2001-2003 Jean-Claude Manoli [jc@manoli.net]
+﻿#region Copyright (C) 2001-2003 Jean-Claude Manoli [jc@manoli.net]
 /*
  * This software is provided 'as-is', without any express or implied warranty.
  * In no event will the author(s) be held liable for any damages arising from
@@ -28,7 +28,7 @@
 using System.Windows.Documents;
 using System.Windows.Media;
 
-namespace Samples.Infrastructure.Core.CodeFormatting
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
 {
   public class CSharpFormat : CLikeFormat
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
similarity index 96%
rename from ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
index 8e71b2970..5b1835328 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 
-namespace Samples.Infrastructure.Core.CodeFormatting
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
 {
   // XML tokenizer, tokens are designed to match Visual Studio syntax highlighting
   class XmlTokenizer
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
new file mode 100644
index 000000000..76527bbbb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
@@ -0,0 +1,100 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
+{
+  public class LiveExplorerTreeViewItem : TreeViewItem
+  {
+    #region Properties
+
+    #region IsNewFeature
+
+    public static readonly DependencyProperty IsNewFeatureProperty = DependencyProperty.Register( "IsNewFeature", typeof( bool ), typeof( LiveExplorerTreeViewItem ), new UIPropertyMetadata( false ) );
+    public bool IsNewFeature
+    {
+      get
+      {
+        return ( bool )GetValue( IsNewFeatureProperty );
+      }
+      set
+      {
+        SetValue( IsNewFeatureProperty, value );
+      }
+    }
+
+    #endregion //IsNewFeature
+
+    #region IsPlusOnlyFeature
+
+    public static readonly DependencyProperty IsPlusOnlyFeatureProperty = DependencyProperty.Register( "IsPlusOnlyFeature", typeof( bool ), typeof( LiveExplorerTreeViewItem ), new UIPropertyMetadata( false ) );
+    public bool IsPlusOnlyFeature
+    {
+      get
+      {
+        return ( bool )GetValue( IsPlusOnlyFeatureProperty );
+      }
+      set
+      {
+        SetValue( IsPlusOnlyFeatureProperty, value );
+      }
+    }
+
+    #endregion //IsPlusOnlyFeature
+
+    #region SampleType
+
+    public static readonly DependencyProperty SampleTypeProperty = DependencyProperty.Register( "SampleType", typeof( Type ), typeof( LiveExplorerTreeViewItem ), new UIPropertyMetadata( null ) );
+    public Type SampleType
+    {
+      get
+      {
+        return ( Type )GetValue( SampleTypeProperty );
+      }
+      set
+      {
+        SetValue( SampleTypeProperty, value );
+      }
+    }
+
+    #endregion //Sample
+
+    #endregion //Properties
+
+    #region Methods
+
+    protected override void OnMouseLeftButtonDown( System.Windows.Input.MouseButtonEventArgs e )
+    {
+      if( this.SampleType == null )
+      {
+        this.IsExpanded = !this.IsExpanded;
+      }
+      else
+      {
+        this.IsSelected = true;
+      }
+      e.Handled = true;
+    }
+
+    #endregion 
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
new file mode 100644
index 000000000..8d7f86a6e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
@@ -0,0 +1,129 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+using System.Windows.Documents;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
+{
+  /// <summary>
+  /// Formats the RichTextBox text as colored Xaml
+  /// </summary>
+  public class XamlFormatter : ITextFormatter
+  {
+    public readonly static XamlFormatter Instance = new XamlFormatter();
+
+    public string GetText( FlowDocument document )
+    {
+      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      document.Blocks.Clear();
+      document.PageWidth = 2500;
+      XamlFormatter.ColorizeXAML( text, document );
+    }
+
+    #region SyntaxColoring
+
+    #region ColorizeXAML
+
+    public static FlowDocument ColorizeXAML( string xamlText, FlowDocument targetDoc )
+    {
+      XmlTokenizer tokenizer = new XmlTokenizer();
+      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+
+      List<XmlToken> tokens = tokenizer.Tokenize( xamlText, ref mode );
+      List<string> tokenTexts = new List<string>( tokens.Count );
+      List<Color> colors = new List<Color>( tokens.Count );
+      int position = 0;
+      foreach( XmlToken token in tokens )
+      {
+        string tokenText = xamlText.Substring( position, token.Length );
+        tokenTexts.Add( tokenText );
+        Color color = ColorForToken( token, tokenText );
+        colors.Add( color );
+        position += token.Length;
+      }
+
+      Paragraph p = new Paragraph();
+
+      // Loop through tokens
+      for( int i = 0; i < tokenTexts.Count; i++ )
+      {
+        Run r = new Run( tokenTexts[ i ] );
+        r.Foreground = new SolidColorBrush( colors[ i ] );
+        p.Inlines.Add( r );
+      }
+
+      targetDoc.Blocks.Add( p );
+
+      return targetDoc;
+    }
+
+    #endregion //ColorizeXAML
+
+    static Color ColorForToken( XmlToken token, string tokenText )
+    {
+      Color color = Color.FromRgb( 0, 0, 0 );
+      switch( token.Kind )
+      {
+        case XmlTokenKind.Open:
+        case XmlTokenKind.OpenClose:
+        case XmlTokenKind.Close:
+        case XmlTokenKind.SelfClose:
+        case XmlTokenKind.CommentBegin:
+        case XmlTokenKind.CommentEnd:
+        case XmlTokenKind.CDataBegin:
+        case XmlTokenKind.CDataEnd:
+        case XmlTokenKind.Equals:
+        case XmlTokenKind.OpenProcessingInstruction:
+        case XmlTokenKind.CloseProcessingInstruction:
+        case XmlTokenKind.AttributeValue:
+          color = Color.FromRgb( 0, 0, 255 );
+          // color = "blue";
+          break;
+        case XmlTokenKind.ElementName:
+          color = Color.FromRgb( 163, 21, 21 );
+          // color = "brown";
+          break;
+        case XmlTokenKind.TextContent:
+          // color = "black";
+          break;
+        case XmlTokenKind.AttributeName:
+        case XmlTokenKind.Entity:
+          color = Color.FromRgb( 255, 0, 0 );
+          // color = "red";
+          break;
+        case XmlTokenKind.CommentText:
+          color = Color.FromRgb( 0, 128, 0 );
+          // color = "green";
+          break;
+      }
+      if( token.Kind == XmlTokenKind.ElementWhitespace
+          || ( token.Kind == XmlTokenKind.TextContent && tokenText.Trim() == "" ) )
+      {
+        // color = null;
+      }
+      return color;
+    }
+    #endregion SyntaxColoring
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
new file mode 100644
index 000000000..5fd4537f5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
@@ -0,0 +1,208 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.IO;
+using System.Windows.Documents;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer
+{
+  public class DemoView : ContentControl
+  {
+    #region Members
+
+    readonly string _applicationPath = String.Empty;
+    const string _samplesFolderName = "Samples";
+
+    #endregion //Members
+
+    #region Properties
+
+    #region CSharpText
+
+    public static readonly DependencyProperty CSharpTextProperty = DependencyProperty.Register( "CSharpText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string CSharpText
+    {
+      get
+      {
+        return ( string )GetValue( CSharpTextProperty );
+      }
+      set
+      {
+        SetValue( CSharpTextProperty, value );
+      }
+    }
+
+    #endregion //CSharpText
+
+    #region Description
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( Paragraph ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public Paragraph Description
+    {
+      get
+      {
+        return ( Paragraph )GetValue( DescriptionProperty );
+      }
+      set
+      {
+        SetValue( DescriptionProperty, value );
+      }
+    }
+
+    #endregion //Description
+
+    #region Title
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )GetValue( TitleProperty );
+      }
+      set
+      {
+        SetValue( TitleProperty, value );
+      }
+    }
+
+    #endregion // Title
+
+    #region VerticalScrollbarVisibility
+
+    public static readonly DependencyProperty VerticalScrollBarVisibilityProperty = DependencyProperty.Register( "VerticalScrollBarVisibility", typeof( ScrollBarVisibility ), typeof( DemoView ), new UIPropertyMetadata( ScrollBarVisibility.Auto ) );
+    public ScrollBarVisibility VerticalScrollBarVisibility
+    {
+      get
+      {
+        return ( ScrollBarVisibility )GetValue( VerticalScrollBarVisibilityProperty );
+      }
+      set
+      {
+        SetValue( VerticalScrollBarVisibilityProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region XamlText
+
+    public static readonly DependencyProperty XamlTextProperty = DependencyProperty.Register( "XamlText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string XamlText
+    {
+      get
+      {
+        return ( string )GetValue( XamlTextProperty );
+      }
+      set
+      {
+        SetValue( XamlTextProperty, value );
+      }
+    }
+
+    #endregion // XamlText
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DemoView()
+    {
+    }
+
+    public DemoView()
+    {
+      _applicationPath = Path.GetDirectoryName( System.Reflection.Assembly.GetExecutingAssembly().Location );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnContentChanged( object oldContent, object newContent )
+    {
+      base.OnContentChanged( oldContent, newContent );
+      //the parent of the content will be the View
+      this.UpdateContentCode( ( newContent as FrameworkElement ).Parent );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void UpdateContentCode( object newContent )
+    {
+      //get the type of the content loaded in the ContentRegion
+      var type = newContent.GetType();
+      //grab only the name of the content which will correspond to the name of the file to load
+      var viewName = type.FullName.Substring( type.FullName.LastIndexOf( "." ) + 1 );
+      //get the module name
+      var moduleName = type.Module.Name.Replace( ".dll", String.Empty );
+
+      this.SetText( viewName, moduleName );
+    }
+
+    private void SetText( string viewName, string moduleName )
+    {
+      this.SetCSharpText( viewName, moduleName );
+      this.SetXamlText( viewName, moduleName );
+    }
+
+    private void SetCSharpText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml", viewName );
+      string filePath = this.GetFilePath( moduleName, fileName );
+      this.XamlText = ReadFileText( filePath );
+    }
+
+    private void SetXamlText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml.cs", viewName );
+      string filePath = this.GetFilePath( moduleName, fileName );
+      this.CSharpText = ReadFileText( filePath );
+    }
+
+    private string GetFilePath( string moduleName, string fileName )
+    {
+      return Path.Combine( _applicationPath, _samplesFolderName, fileName );
+    }
+
+    private static string ReadFileText( string filePath )
+    {
+      string text = String.Empty;
+      if( File.Exists( filePath ) )
+        text = File.ReadAllText( filePath );
+      return text;
+    }
+
+    internal void Hyperlink_RequestNavigate( object sender, System.Windows.Navigation.RequestNavigateEventArgs e )
+    {
+      Process.Start( new ProcessStartInfo( e.Uri.AbsoluteUri ) );
+      e.Handled = true;
+    }
+
+    #endregion // Methods
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
new file mode 100644
index 000000000..100c61def
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
@@ -0,0 +1,35 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.HomeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="What's new">
+   <Grid>
+      <xctk:RichTextBox
+            BorderThickness="0"
+            IsReadOnly="True" 
+            IsHitTestVisible="False" 
+            Focusable="False">
+         <FlowDocument>
+            <Paragraph>
+               What's new
+            </Paragraph>
+         </FlowDocument>
+      </xctk:RichTextBox>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
new file mode 100644
index 000000000..6ccc8c395
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
@@ -0,0 +1,27 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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 Xceed.Wpf.Toolkit.LiveExplorer
+{
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
new file mode 100644
index 000000000..89583c274
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
@@ -0,0 +1,591 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<Window x:Class="Xceed.Wpf.Toolkit.LiveExplorer.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+        xmlns:samples="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples;assembly=Xceed.Wpf.Toolkit.LiveExplorer"
+        xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Core"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        AllowsTransparency="False"
+        Icon="App.ico"
+        Title="Extended WPF Toolkit - LiveExplorer" Height="768" Width="1210" >
+   <Window.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="Resources/LiveExplorerScrollViewer.xaml"/>
+         </ResourceDictionary.MergedDictionaries>
+
+         <!--This style is used to override the LiveExplorer scroll bar within the samples-->
+         <Style x:Key="ScrollBarBaseStyle" TargetType="{x:Type ScrollBar}" />
+
+         <BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+
+         <PathGeometry x:Key="TreeArrow">
+            <PathGeometry.Figures>
+               <PathFigureCollection>
+                  <PathFigure IsFilled="True"
+                            StartPoint="0 0"
+                            IsClosed="True">
+                     <PathFigure.Segments>
+                        <PathSegmentCollection>
+                           <LineSegment Point="8 4"/>
+                           <LineSegment Point="0 8"/>
+                        </PathSegmentCollection>
+                     </PathFigure.Segments>
+                  </PathFigure>
+               </PathFigureCollection>
+            </PathGeometry.Figures>
+         </PathGeometry>
+
+         <Style x:Key="ExpandCollapseToggleStyle"
+           TargetType="{x:Type ToggleButton}">
+            <Setter Property="Focusable"
+                Value="False"/>
+            <Setter Property="Width"
+                Value="20"/>
+            <Setter Property="Height"
+                Value="20"/>
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type ToggleButton}">
+                     <Border Width="20"
+                            Height="20"
+                            Background="Transparent"
+                            Padding="5,6,3,3">
+                        <Path x:Name="ExpandPath"
+                              Fill="#FFEFAC27"
+                              Stroke="#FFEFAC27"
+                              Data="{StaticResource TreeArrow}">
+                        </Path>
+                     </Border>
+                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver"
+                                 Value="True">
+                           <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="#FFEFAC27"/>
+                           <Setter TargetName="ExpandPath"
+                                    Property="Fill"
+                                    Value="#FFEFAC27"/>
+                        </Trigger>
+
+                        <Trigger Property="IsChecked"
+                                 Value="True">
+                           <Setter TargetName="ExpandPath"
+                                    Property="RenderTransform">
+                              <Setter.Value>
+                                 <RotateTransform Angle="90"
+                                                     CenterX="4"
+                                                     CenterY="4"/>
+                              </Setter.Value>
+                           </Setter>
+                           <Setter TargetName="ExpandPath"
+                                    Property="Fill"
+                                    Value="#FFEFAC27"/>
+                           <Setter TargetName="ExpandPath"
+                                    Property="Stroke"
+                                    Value="#FFEFAC27"/>
+                        </Trigger>
+                     </ControlTemplate.Triggers>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+         </Style>
+
+         <ControlTemplate x:Key="TreeViewItemTemplate" TargetType="{x:Type TreeViewItem}">
+            <Grid>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition MinWidth="19"
+                                        Width="Auto"/>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="*"/>
+               </Grid.ColumnDefinitions>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto"/>
+                  <RowDefinition/>
+               </Grid.RowDefinitions>
+               <ToggleButton x:Name="Expander"
+                                Style="{StaticResource ExpandCollapseToggleStyle}"
+                                IsChecked="{Binding Path=IsExpanded,RelativeSource={RelativeSource TemplatedParent}}"
+                                ClickMode="Press"/>
+               <Border Name="Bd"
+                        Grid.Column="1"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Padding="{TemplateBinding Padding}"
+                        SnapsToDevicePixels="true">
+                  <ContentPresenter x:Name="PART_Header"
+                                        ContentSource="Header"
+                                        HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                        SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
+               </Border>
+               <ItemsPresenter x:Name="ItemsHost"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Grid.ColumnSpan="2"/>
+            </Grid>
+            <ControlTemplate.Triggers>
+               <Trigger Property="IsExpanded"
+                                Value="false">
+                  <Setter TargetName="ItemsHost"
+                                Property="Visibility"
+                                Value="Collapsed"/>
+               </Trigger>
+               <Trigger Property="HasItems"
+                                Value="false">
+                  <Setter TargetName="Expander"
+                                Property="Visibility"
+                                Value="Hidden"/>
+               </Trigger>
+               <Trigger Property="IsSelected"
+                                Value="true">
+                  <Setter TargetName="Bd"
+                                Property="Background"
+                                Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
+                  <Setter Property="Foreground"
+                                Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}"/>
+               </Trigger>
+               <MultiTrigger>
+                  <MultiTrigger.Conditions>
+                     <Condition Property="IsSelected"
+                                        Value="true"/>
+                     <Condition Property="IsSelectionActive"
+                                        Value="false"/>
+                  </MultiTrigger.Conditions>
+                  <Setter TargetName="Bd"
+                                Property="Background"
+                                Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                  <Setter Property="Foreground"
+                                Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
+               </MultiTrigger>
+               <Trigger Property="IsEnabled"
+                                Value="false">
+                  <Setter Property="Foreground"
+                                Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+               </Trigger>
+            </ControlTemplate.Triggers>
+         </ControlTemplate>
+
+         <Style x:Key="treeItemSuffixStyle" TargetType="TextBlock">
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="FontFamily" Value="Segoe" />
+            <Setter Property="FontWeight" Value="SemiBold" />
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="Margin" Value="5,0,0,0" />
+         </Style>
+
+         <Style x:Key="treeItemNewSuffix" TargetType="TextBlock" BasedOn="{StaticResource treeItemSuffixStyle}">
+            <Setter Property="Text" Value="New" />
+            <Setter Property="Foreground" Value="#ea00ff" />
+            <Setter Property="Visibility" Value="{Binding IsNewFeature, RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Converter={StaticResource BoolToVisibilityConverter}}" />
+         </Style>
+
+
+      <Style x:Key="treeItemPlusSuffix" TargetType="TextBlock" BasedOn="{StaticResource treeItemSuffixStyle}">
+         <Setter Property="Text" Value="Plus Only" />
+         <Setter Property="Foreground" Value="#06b025" />
+         <Setter Property="Visibility" Value="{Binding IsPlusOnlyFeature, RelativeSource={RelativeSource AncestorType={x:Type TreeViewItem}}, Converter={StaticResource BoolToVisibilityConverter}}" />
+      </Style>
+
+         <Style x:Key="TreeViewHeaderStyle" TargetType="TreeViewItem">
+            <Style.Resources>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}">
+                  Transparent
+               </SolidColorBrush>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}">
+                  Black
+               </SolidColorBrush>
+            </Style.Resources>
+
+            <Setter Property="FontSize" Value="30" />
+            <Setter Property="FontFamily" Value="Segoe UI" />
+            <Setter Property="FontWeight" Value="Light" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="Focusable" Value="False" />
+            <Setter Property="IsExpanded" Value="True" />
+            <Setter Property="Template" Value="{StaticResource TreeViewItemTemplate}" />
+            <Setter Property="HeaderTemplate">
+               <Setter.Value>
+                  <DataTemplate>
+                     <Border x:Name="_treeViewItemBorder">
+                        <StackPanel Orientation="Horizontal">
+                           <TextBlock Text="{Binding}" Cursor="Hand" Margin="0,0,5,0"/>
+                           <TextBlock Style="{StaticResource treeItemNewSuffix}" />
+                           <TextBlock Style="{StaticResource treeItemPlusSuffix}" />
+                        </StackPanel>
+                     </Border>
+                  </DataTemplate>
+               </Setter.Value>
+            </Setter>
+         </Style>
+
+         <Style x:Key="TreeViewSubHeaderStyle" TargetType="TreeViewItem">
+            <Style.Resources>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}">
+                  Transparent
+               </SolidColorBrush>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightTextBrushKey}">
+                  Black
+               </SolidColorBrush>
+            </Style.Resources>
+
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="FontFamily" Value="Segoe UI" />
+            <Setter Property="FontWeight" Value="Light" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="Template" Value="{StaticResource TreeViewItemTemplate}" />
+            <Setter Property="HeaderTemplate">
+               <Setter.Value>
+                  <DataTemplate>
+                     <TextBlock Text="{Binding}" Cursor="Hand" />
+                  </DataTemplate>
+               </Setter.Value>
+            </Setter>
+         </Style>
+
+         <Style x:Key="TreeViewItemStyle" TargetType="TreeViewItem">
+            <Style.Resources>
+               <SolidColorBrush x:Key="{x:Static SystemColors.HighlightBrushKey}">
+                  Transparent
+               </SolidColorBrush>
+               <SolidColorBrush x:Key="{x:Static SystemColors.ControlBrushKey}">
+                  Transparent
+               </SolidColorBrush>
+            </Style.Resources>
+
+            <Setter Property="FontSize" Value="14" />
+            <Setter Property="FontFamily" Value="Segoe UI" />
+            <Setter Property="FontWeight" Value="Light" />
+            <Setter Property="Foreground" Value="Black" />
+            <Setter Property="Template" Value="{StaticResource TreeViewItemTemplate}" />
+            <Setter Property="HeaderTemplate">
+               <Setter.Value>
+                  <DataTemplate>
+                     <Border x:Name="_treeViewItemBorder">
+                        <StackPanel Orientation="Horizontal">
+                           <TextBlock Text="{Binding}" Margin="0,0,5,0"/>
+                           <TextBlock Style="{StaticResource treeItemNewSuffix}" />
+                           <TextBlock Style="{StaticResource treeItemPlusSuffix}" />
+                        </StackPanel>
+                     </Border>
+                     <DataTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True" >
+                           <Setter Property="Background" Value="#e8e8e8" TargetName="_treeViewItemBorder"/>
+                        </Trigger>
+                     </DataTemplate.Triggers>
+                  </DataTemplate>
+               </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+               <Trigger Property="IsSelected" Value="True">
+                  <Setter Property="FontWeight" Value="Bold" />
+                  <Setter Property="Foreground" Value="#efac27" />
+               </Trigger>
+            </Style.Triggers>
+         </Style>
+
+         <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type TabControl}">
+                     <Grid KeyboardNavigation.TabNavigation="Local">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="*" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*"/>
+                           <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
+
+                        <!-- Title -->
+                        <TextBlock HorizontalAlignment="Left" 
+                                    Margin="12,0,0,0" 
+                                    VerticalAlignment="Top"
+                                    FontSize="30" 
+                                    FontFamily="Segoe UI" 
+                                    FontWeight="Light"
+                                    TextAlignment="right" 
+                                    Foreground="Black" 
+                                    TextTrimming="CharacterEllipsis"
+                                    Text="{Binding View.Title, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
+                        <TabPanel Grid.Column="1" Margin="0,0,13,0" Background="Transparent" IsItemsHost="True" HorizontalAlignment="Right" />
+                        <ContentPresenter Grid.Row="1" Grid.ColumnSpan="2" Margin="4" ContentSource="SelectedContent" />
+                     </Grid>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+         </Style>
+
+         <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type TabItem}">
+                     <Grid  Height="33">
+                        <Border x:Name="border" Background="#e8e8e8" Margin="3,0,3,0"/>
+                        <TextBlock x:Name="textBlock" HorizontalAlignment="Center" Margin="19,0,19,0" VerticalAlignment="Center" FontFamily="Segoe UI" FontSize="14" FontWeight="SemiBold"  Foreground="Black" Text="{TemplateBinding Header}" TextWrapping="Wrap" />
+                     </Grid>
+                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                           <Setter Property="Background" TargetName="border" Value="#efac27" />
+                           <Setter Property="Foreground" TargetName="textBlock" Value="White" />
+                        </Trigger>
+                     </ControlTemplate.Triggers>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+            <Setter Property="Margin" Value="0,0,1,0" />
+         </Style>
+
+      </ResourceDictionary>
+   </Window.Resources>
+   <Grid Margin="30,30,0,0">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition MinWidth="260" Width="Auto" />
+         <ColumnDefinition />
+      </Grid.ColumnDefinitions>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="130"/>
+         <RowDefinition />
+      </Grid.RowDefinitions>
+
+      <Image Source="Resources/xceed_logo.png" MouseLeftButtonDown="Image_MouseLeftButtonDown"/>
+
+      <TreeView x:Name="_treeView" Grid.Row="1" BorderThickness="0" SelectedItemChanged="OnTreeViewSelectionChanged">
+         <TreeView.Resources>
+            <Style TargetType="ScrollViewer" BasedOn="{StaticResource LiveExplorerScrollViewerStyle}"/>
+         </TreeView.Resources>
+         <core:LiveExplorerTreeViewItem Header="Data" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="PropertyGrid" ItemContainerStyle="{StaticResource TreeViewSubHeaderStyle}" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridView}">
+               <core:LiveExplorerTreeViewItem Header="Editors" ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+                  <core:LiveExplorerTreeViewItem Header="Default Editors" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridDefaultEditorsView}"/>
+                  <core:LiveExplorerTreeViewItem Header="EditorTemplateDefinition" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridCustomEditorsView}"/>
+                  <core:LiveExplorerTreeViewItem Header="More EditorDefinitions..." SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridEditorDefinitionsView}" IsPlusOnlyFeature="True" IsNewFeature="True"/>
+               </core:LiveExplorerTreeViewItem>
+               <core:LiveExplorerTreeViewItem Header="Using SelectedObject(s)"  SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridSelectedObjectView}" 
+                                                   Style="{StaticResource TreeViewItemStyle}"
+                                                   ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+                  <core:LiveExplorerTreeViewItem Header="Using Attributes" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridAttributesView}" />
+                  <core:LiveExplorerTreeViewItem Header="Specifying Properties" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridSpecifyingPropertiesView}" />
+                  <core:LiveExplorerTreeViewItem Header="Binding to Structs" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridBindingToStructsView}"/>
+                  <core:LiveExplorerTreeViewItem Header="Category Ordering" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridCategoryOrderView}" IsPlusOnlyFeature="True" />
+                  <core:LiveExplorerTreeViewItem Header="Localization" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridDisplayLocalizationView}" IsPlusOnlyFeature="True"/>
+                  <core:LiveExplorerTreeViewItem Header="Multi-Selected Objects" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridMultiSelectedObjectsView}" IsPlusOnlyFeature="True"/>
+                  <core:LiveExplorerTreeViewItem Header="DefinitionKey Attribute" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridDefinitionKeyView}" IsNewFeature="True" IsPlusOnlyFeature="True"/>
+               </core:LiveExplorerTreeViewItem>
+               <core:LiveExplorerTreeViewItem Header="Using a Custom List" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridPropertiesSourceView}" 
+                                              IsPlusOnlyFeature="True" IsNewFeature="True"
+                                              Style="{StaticResource TreeViewItemStyle}"
+                                              ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+                  <core:LiveExplorerTreeViewItem Header="Property Element Syntax" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridPropertiesView}"/>
+                  <core:LiveExplorerTreeViewItem Header="Custom Properties" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridCustomPropertyView}"/>
+               </core:LiveExplorerTreeViewItem>
+               <core:LiveExplorerTreeViewItem Header="Customizing PropertyItems" SampleType="{x:Type samples:PropertyGrid.Views.PropertyGridPropertyItemStyleView}" 
+                                              Style="{StaticResource TreeViewItemStyle}"
+                                              IsNewFeature="True" />
+
+            </core:LiveExplorerTreeViewItem>
+            <core:LiveExplorerTreeViewItem Header="DataGrid" SampleType="{x:Type samples:DataGrid.Views.DataGridView}"/>
+            <core:LiveExplorerTreeViewItem Header="Multi-Column ComboBox" SampleType="{x:Type samples:DataGrid.Views.MultiColumnComboBoxView}" IsPlusOnlyFeature="True"/>
+
+            <core:LiveExplorerTreeViewItem Header="ListBox" ItemContainerStyle="{StaticResource TreeViewItemStyle}" SampleType="{x:Type samples:ListBox.Views.ListBoxView}" IsNewFeature="True" IsPlusOnlyFeature="True" />
+
+            <core:LiveExplorerTreeViewItem Header="Check lists" SampleType="{x:Type samples:CheckLists.Views.CheckListsView}" />
+            <core:LiveExplorerTreeViewItem Header="TimelinePanel" SampleType="{x:Type samples:TimelinePanel.Views.TimelinePanelView}"/>
+         </core:LiveExplorerTreeViewItem>         
+         <core:LiveExplorerTreeViewItem Header="Input Fields" Style="{StaticResource TreeViewHeaderStyle}" ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="Numbers" SampleType="{x:Type samples:Numeric.Views.NumericView}" />
+            <core:LiveExplorerTreeViewItem Header="DateTime" SampleType="{x:Type samples:DateTime.Views.DateTimeView}" />
+            <core:LiveExplorerTreeViewItem Header="Color" SampleType="{x:Type samples:Color.Views.ColorView}" />
+            <core:LiveExplorerTreeViewItem Header="Text" Style="{StaticResource TreeViewSubHeaderStyle}" ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+               <core:LiveExplorerTreeViewItem Header="AutoSelectTextBox" SampleType="{x:Type samples:Text.Views.AutoSelectTextboxView}"/>
+               <core:LiveExplorerTreeViewItem Header="MaskedTextBox" SampleType="{x:Type samples:Text.Views.MaskedTextboxView}"/>
+               <core:LiveExplorerTreeViewItem Header="MultiLineTextEditor" SampleType="{x:Type samples:Text.Views.MultiLineTextEditorView}"/>
+               <core:LiveExplorerTreeViewItem Header="RichTextBox" SampleType="{x:Type samples:Text.Views.RichTextboxView}" />
+               <core:LiveExplorerTreeViewItem Header="WatermarkTextBox" SampleType="{x:Type samples:Text.Views.WatermarkTextboxView}" />
+            </core:LiveExplorerTreeViewItem>
+            <core:LiveExplorerTreeViewItem Header="Enumeration" SampleType="{x:Type samples:Button.Views.ButtonSpinnerView}" />
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Buttons" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="DropDown and Split Buttons" SampleType="{x:Type samples:Button.Views.DropDownSplitButtonView}" />
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Charts" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}" IsNewFeature="True" IsPlusOnlyFeature="True">
+            <core:LiveExplorerTreeViewItem Header="Types" SampleType="{x:Type samples:Chart.Views.ChartSeriesBasicTypesView}"/>
+            <core:LiveExplorerTreeViewItem Header="DataPoints Binding" SampleType="{x:Type samples:Chart.Views.ChartSeriesDataPointsBindingView}"/>
+            <core:LiveExplorerTreeViewItem Header="Axis" SampleType="{x:Type samples:Chart.Views.ChartAxisView}"/>
+            <core:LiveExplorerTreeViewItem Header="Legend" SampleType="{x:Type samples:Chart.Views.ChartLegendView}"/>
+            <core:LiveExplorerTreeViewItem Header="Styling" ItemContainerStyle="{StaticResource TreeViewItemStyle}" Style="{StaticResource TreeViewSubHeaderStyle}">
+               <core:LiveExplorerTreeViewItem Header="Axes Grid" SampleType="{x:Type samples:Chart.Views.ChartStylingAxesGridView}"/>
+               <core:LiveExplorerTreeViewItem Header="Line Series" SampleType="{x:Type samples:Chart.Views.ChartStylingLineSeriesView}"/>
+               <core:LiveExplorerTreeViewItem Header="Column Series" SampleType="{x:Type samples:Chart.Views.ChartStylingColumnSeriesView}"/>
+               <core:LiveExplorerTreeViewItem Header="Pie Series" SampleType="{x:Type samples:Chart.Views.ChartStylingPieSeriesView}"/>
+            </core:LiveExplorerTreeViewItem>
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Windows" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="StylableWindows" SampleType="{x:Type samples:Window.Views.StylableWindowView}" IsNewFeature="True"/>
+            <core:LiveExplorerTreeViewItem Header="ChildWindow" SampleType="{x:Type samples:Window.Views.ChildWindowView}" />
+            <core:LiveExplorerTreeViewItem Header="WindowContainer" SampleType="{x:Type samples:Window.Views.WindowContainerView}" IsNewFeature="True"/>
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Productivity" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="BusyIndicator" ItemContainerStyle="{StaticResource TreeViewItemStyle}" SampleType="{x:Type samples:BusyIndicator.Views.BusyIndicatorView}" >
+               <core:LiveExplorerTreeViewItem Header="Custom Content" SampleType="{x:Type samples:BusyIndicator.Views.BusyIndicatorCustomContentView}" />
+               <core:LiveExplorerTreeViewItem Header="Custom Content Template" SampleType="{x:Type samples:BusyIndicator.Views.BusyIndicatorCustomContentTemplateView}" />
+            </core:LiveExplorerTreeViewItem>
+            <core:LiveExplorerTreeViewItem Header="Calculator" SampleType="{x:Type samples:Calculator.Views.CalculatorView}"/>
+            <core:LiveExplorerTreeViewItem Header="Wizard" SampleType="{x:Type samples:Wizard.Views.WizardView}"/>
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Other" Style="{StaticResource TreeViewHeaderStyle}"  ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="AvalonDock" SampleType="{x:Type samples:AvalonDock.Views.AvalonDockView}" IsNewFeature="True" />
+            <core:LiveExplorerTreeViewItem Header="Magnifier" SampleType="{x:Type samples:Magnifier.Views.MagnifierView}" />
+            <core:LiveExplorerTreeViewItem Header="Pie"  ItemContainerStyle="{StaticResource TreeViewItemStyle}" SampleType="{x:Type samples:Pie.Views.PieView}">
+               <core:LiveExplorerTreeViewItem Header="Chart" SampleType="{x:Type samples:Pie.Views.PieChartView}" />
+               <core:LiveExplorerTreeViewItem Header="Progress" SampleType="{x:Type samples:Pie.Views.PieProgressView}"/>
+            </core:LiveExplorerTreeViewItem>
+            <core:LiveExplorerTreeViewItem Header="Zoombox" SampleType="{x:Type samples:Zoombox.Views.ZoomboxView}" />
+            <core:LiveExplorerTreeViewItem Header="PileFlowPanel" SampleType="{x:Type samples:PileFlowPanel.Views.PileFlowPanelView}" IsNewFeature="True" IsPlusOnlyFeature="True"/>
+            <core:LiveExplorerTreeViewItem Header="SwitchPanel" SampleType="{x:Type samples:Panels.Views.SwitchPanelView}"/>
+         </core:LiveExplorerTreeViewItem>
+         <core:LiveExplorerTreeViewItem Header="Theming" Style="{StaticResource TreeViewHeaderStyle}" ItemContainerStyle="{StaticResource TreeViewItemStyle}">
+            <core:LiveExplorerTreeViewItem Header="Extended Toolkit controls" SampleType="{x:Type samples:Theming.Views.ThemingExtendedToolkitView}" IsPlusOnlyFeature="True"/>
+            <core:LiveExplorerTreeViewItem Header="Core WPF controls" SampleType="{x:Type samples:Theming.Views.ThemingCoreWPFView}" IsPlusOnlyFeature="True"/>
+            <core:LiveExplorerTreeViewItem Header="Datagrid control" SampleType="{x:Type samples:Theming.Views.ThemingDataGridView}" IsPlusOnlyFeature="True"/>
+            <core:LiveExplorerTreeViewItem Header="ListBox control" SampleType="{x:Type samples:Theming.Views.ThemingListBoxView}" IsPlusOnlyFeature="True" IsNewFeature="True"/>
+         </core:LiveExplorerTreeViewItem>
+      </TreeView>
+
+      <Grid Grid.Column="1" Grid.Row="1">
+         <!-- TabControl with Sample-XAML-Code TabItems -->
+         <TabControl TabStripPlacement="Top" Style="{StaticResource TabControlStyle}">
+            <TabItem Header="Sample" Style="{StaticResource TabItemStyle}">
+
+               <Grid>
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*"/>
+                     <ColumnDefinition Width="Auto"/>
+                  </Grid.ColumnDefinitions>
+
+                  <!-- The sample itself -->
+                  <ScrollViewer x:Name="_contentScrollViewer" 
+                                Style="{StaticResource LiveExplorerScrollViewerStyle}"
+                                VerticalScrollBarVisibility="{Binding View.VerticalScrollBarVisibility, RelativeSource={RelativeSource AncestorType={x:Type Window}}}">
+                     <ContentPresenter Content="{Binding View, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" Margin="10,0,10,0" ScrollViewer.CanContentScroll="True" >
+                        <ContentPresenter.Resources>
+                           <!--
+                           Since the LiveExplorerScrollViewerStyle applied on the parent ScrollViewer will override
+                           all ScrollBar styles for controls within the ScrollViewer, we must again override the default
+                           style for all scrollbars in the ContentPresenter to reapply the default style.
+                           -->
+                           <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource ScrollBarBaseStyle}"/>
+                        </ContentPresenter.Resources>
+                     </ContentPresenter>
+                  </ScrollViewer>
+
+                  <!-- Right border for sample description -->
+                  <Border Grid.Column="1" Width="225" BorderThickness="1" BorderBrush="Gray" Margin="0,0,12,0">
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="*" />
+                           <RowDefinition Height="17" />
+                           <RowDefinition Height="20" />
+                           <RowDefinition Height="5" />
+                        </Grid.RowDefinitions>
+
+                        <!-- Sample title -->
+                        <TextBlock TextWrapping="Wrap"
+                                 Foreground="#FF606060"
+                                 FontSize="16"
+                                 FontWeight="Bold"
+                                 FontFamily="Segoe UI"
+                                 Margin="5,5"
+                                 Text="{Binding View.Title, RelativeSource={RelativeSource AncestorType={x:Type Window}}}" />
+
+                        <!-- Description is added in Code-behind to support Paragraphs -->
+                        <ScrollViewer Grid.Row="1" 
+                                                Style="{StaticResource LiveExplorerScrollViewerStyle}"
+                                                Margin="5,0"
+                                                VerticalScrollBarVisibility="Auto"
+                                                HorizontalScrollBarVisibility="Disabled"
+                                                BorderBrush="Transparent"
+                                                BorderThickness="0"
+                                                Focusable="False">
+                           <RichTextBox BorderThickness="0" 
+                                        IsReadOnly="True" 
+                                        IsHitTestVisible="True" 
+                                        IsDocumentEnabled="True"
+                                        Focusable="False">
+                              <FlowDocument  x:Name="_flowDocumentDesc"/>
+                           </RichTextBox>
+                        </ScrollViewer>
+
+                        <!-- Bottom Rectangle -->
+                        <Rectangle Grid.Row="2" 
+                                   Grid.RowSpan="3"
+                                   Fill="#FFEFAC27" />
+
+                        <!-- Bottom Rectangle text -->
+                        <TextBlock Grid.Row="2"
+                                 Foreground="Gray"
+                                 FontFamily="Verdana"
+                                 FontSize="12"
+                                 Margin="5,5,5,0"
+                                 Text="Additional Information" />
+
+                        <!-- Bottom Rectangle Hyperlink -->
+                        <TextBlock Grid.Row="3" Margin="20,5,5,0"> 
+                           <Hyperlink FontWeight="Black" 
+                                    Foreground="White" 
+                                    FontFamily="Verdana"
+                                    FontSize="12"
+                                    Focusable="False"
+                                    RequestNavigate="Hyperlink_RequestNavigate" 
+                                    NavigateUri="https://wpftoolkit.codeplex.com/"> 
+                              Extended WPF Toolkit  
+                           </Hyperlink>
+                        </TextBlock>
+                     </Grid>
+                  </Border>
+               </Grid>
+            </TabItem>
+            <TabItem Header="XAML" Style="{StaticResource TabItemStyle}">
+               <xctk:RichTextBox Text="{Binding View.XamlText, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
+                                        TextFormatter="{x:Static core:XamlFormatter.Instance}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalScrollBarVisibility="Auto"
+                                        VerticalScrollBarVisibility="Auto"
+                                        IsReadOnly="True"
+                                        FontFamily="Courier New"
+                                        Margin="5,10,5,5" />
+            </TabItem>
+            <TabItem Header="Code" Style="{StaticResource TabItemStyle}">
+               <xctk:RichTextBox Text="{Binding View.CSharpText, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
+                                        TextFormatter="{x:Static core:CSharpFormatter.Instance}"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalScrollBarVisibility="Auto"
+                                        VerticalScrollBarVisibility="Auto"
+                                        IsReadOnly="True"
+                                        FontFamily="Courier New"
+                                        Margin="5,10,5,5" />
+            </TabItem>
+         </TabControl>
+      </Grid>
+   </Grid>
+</Window>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
new file mode 100644
index 000000000..69c5f9987
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
@@ -0,0 +1,133 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using System.Globalization;
+using System.Reflection;
+using Xceed.Wpf.Toolkit.LiveExplorer;
+using Xceed.Wpf.Toolkit.LiveExplorer.Core;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer
+{
+  /// <summary>
+  /// Interaction logic for MainWindow.xaml
+  /// </summary>
+  public partial class MainWindow : Window
+  {
+    private const string toolkitAssembly = "Xceed.Wpf.Toolkit.LiveExplorer";
+
+    public MainWindow()
+    {
+      InitializeComponent();
+    }
+
+    #region Properties
+
+    #region View
+
+    public static readonly DependencyProperty ViewProperty = DependencyProperty.Register( "View", typeof( DemoView ), typeof( MainWindow ), new UIPropertyMetadata( null, OnViewChanged ) );
+    public DemoView View
+    {
+      get
+      {
+        return ( DemoView )GetValue( ViewProperty );
+      }
+      set
+      {
+        SetValue( ViewProperty, value );
+      }
+    }
+
+    private static void OnViewChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MainWindow window = o as MainWindow;
+      if( window != null )
+        window.OnViewChanged( ( DemoView )e.OldValue, ( DemoView )e.NewValue );
+    }
+
+    protected virtual void OnViewChanged( DemoView oldValue, DemoView newValue )
+    {
+      if( _flowDocumentDesc != null )
+      {
+        _flowDocumentDesc.Blocks.Clear();
+        if( this.View.Description != null )
+        {
+          _flowDocumentDesc.Blocks.Add( this.View.Description );
+        }
+      }
+      if( _contentScrollViewer != null )
+      {
+      _contentScrollViewer.ScrollToHome();
+      }
+
+    }
+
+    #endregion //View
+
+    #endregion //Properties
+
+    #region Event Handler
+
+    private void OnTreeViewSelectionChanged( object sender, RoutedPropertyChangedEventArgs<Object> e )
+    {
+      this.UpdateSelectedView( e.NewValue as LiveExplorerTreeViewItem );
+    }
+
+    private void UpdateSelectedView( LiveExplorerTreeViewItem treeViewItem )
+    {
+      if( treeViewItem != null )
+      {
+        Type type = treeViewItem.SampleType;
+        if( type != null )
+        {
+          string name = type.FullName;
+
+          Assembly assembly = Assembly.Load( toolkitAssembly );
+          Type sampleType = assembly.GetType( name );
+
+          this.View = (DemoView)Activator.CreateInstance( sampleType );
+        }
+      }
+    }
+
+    private void Hyperlink_RequestNavigate( object sender, System.Windows.Navigation.RequestNavigateEventArgs e )
+    {
+      Process.Start( new ProcessStartInfo( e.Uri.AbsoluteUri ) );
+      e.Handled = true;
+    }
+
+    private void Image_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      //When the user clicks the Xceed logo on the top left.
+      //
+    }
+
+    #endregion //EventHandler
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..5a97fa2c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
@@ -0,0 +1,59 @@
+﻿using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle( "Xceed Extended WPF Toolkit LiveExplorer" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyCompany( "Xceed Software Inc." )]
+[assembly: AssemblyProduct( "Xceed Extended WPF Toolkit" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
+[assembly: AssemblyCulture( "" )]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible( false )]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[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)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion( "2.0.0.0" )]
+[assembly: AssemblyFileVersion( "2.0.0.0" )]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign( false )]
+[assembly: AssemblyKeyFile( @"..\..\..\sn.snk" )]
+[assembly: AssemblyKeyName( "" )]
+#pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs
new file mode 100644
index 000000000..04d2a42da
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.Designer.cs
@@ -0,0 +1,63 @@
+﻿//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.296
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Properties {
+    using System;
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources() {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.Toolkit.LiveExplorer.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
+                return resourceCulture;
+            }
+            set {
+                resourceCulture = value;
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
new file mode 100644
index 000000000..ffecec851
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Resources.resx
@@ -0,0 +1,117 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.Designer.cs
new file mode 100644
index 000000000..0e446437b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.Designer.cs
@@ -0,0 +1,26 @@
+﻿//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.296
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Properties {
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default {
+            get {
+                return defaultInstance;
+            }
+        }
+    }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings
new file mode 100644
index 000000000..8f2fd95d6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/Settings.settings
@@ -0,0 +1,7 @@
+﻿<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/app.manifest b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/app.manifest
new file mode 100644
index 000000000..8df620839
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/app.manifest
@@ -0,0 +1,47 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app" />
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <!-- UAC Manifest Options
+            If you want to change the Windows User Account Control level replace the 
+            requestedExecutionLevel node with one of the following.
+
+        <requestedExecutionLevel  level="asInvoker" uiAccess="false" />
+        <requestedExecutionLevel  level="requireAdministrator" uiAccess="false" />
+        <requestedExecutionLevel  level="highestAvailable" uiAccess="false" />
+
+            Specifying requestedExecutionLevel node will disable file and registry virtualization.
+            If you want to utilize File and Registry Virtualization for backward 
+            compatibility then delete the requestedExecutionLevel node.
+        -->
+        <requestedExecutionLevel level="asInvoker" uiAccess="false" />
+      </requestedPrivileges>
+      <applicationRequestMinimum>
+        <defaultAssemblyRequest permissionSetReference="Custom" />
+        <PermissionSet class="System.Security.PermissionSet" version="1" ID="Custom" SameSite="site" Unrestricted="true" />
+      </applicationRequestMinimum>
+    </security>
+  </trustInfo>
+  <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+    <application>
+      <!-- A list of all Windows versions that this application is designed to work with. Windows will automatically select the most compatible environment.-->
+      <!-- If your application is designed to work with Windows 7, uncomment the following supportedOS node-->
+      <!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>-->
+    </application>
+  </compatibility>
+  <!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
+  <!-- <dependency>
+    <dependentAssembly>
+      <assemblyIdentity
+          type="win32"
+          name="Microsoft.Windows.Common-Controls"
+          version="6.0.0.0"
+          processorArchitecture="*"
+          publicKeyToken="6595b64144ccf1df"
+          language="*"
+        />
+    </dependentAssembly>
+  </dependency>-->
+</asmv1:assembly>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
new file mode 100644
index 000000000..a893d53be
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
@@ -0,0 +1,532 @@
+﻿<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <LinearGradientBrush x:Key="VerticalScrollBarBackground"
+                              EndPoint="1,0"
+                              StartPoint="0,0">
+      <GradientStop Color="#E1E1E1"
+                          Offset="0" />
+      <GradientStop Color="#EDEDED"
+                          Offset="0.20" />
+      <GradientStop Color="#EDEDED"
+                          Offset="0.80" />
+      <GradientStop Color="#E3E3E3"
+                          Offset="1" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ScrollBarDisabledBackground"
+                          Color="#F4F4F4" />
+
+   <Style x:Key="ScrollBarButtonUp"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Grid>
+                  <Border x:Name="Border"
+                                Background="Transparent" />
+                  <Path x:Name="IconArrowDecreasePath"
+                              Opacity="1"
+                              Data="M 337.57757568359375,322 C337.57757568359375,322 334,326 334,326 334,326 341,326 341,326 341,326 337.57757568359375,322 337.57757568359375,322 z"
+                              Height="4"
+                              Stretch="Uniform"
+                              Width="8">
+                     <Path.Fill>
+                        <SolidColorBrush x:Name="ButtonColor"
+                                               Color="#FFCECECE" />
+                     </Path.Fill>
+                  </Path>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsKeyboardFocused"
+                                 Value="true">
+                  </Trigger>
+                  <Trigger Property="IsMouseOver"
+                                 Value="true">
+                     <Setter Property="Fill"
+                                   Value="#888888"
+                                   TargetName="IconArrowDecreasePath" />
+                  </Trigger>
+                  <Trigger Property="IsPressed"
+                                 Value="true">
+                  </Trigger>
+                  <Trigger Property="IsEnabled"
+                                 Value="false">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="IconArrowDecreasePath" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ScrollBarButtonDown"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Grid>
+                  <Border x:Name="Border"
+                                Background="Transparent" />
+                  <Path x:Name="IconArrowIncreasePath"
+                              Data="M 337.42242431640625,334 C337.42242431640625,334 341,330 341,330 341,330 334,330 334,330 334,330 337.42242431640625,334 337.42242431640625,334 z"
+                              Height="4"
+                              Stretch="Uniform"
+                              Width="8"
+                              Fill="#FFCECECE" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsKeyboardFocused"
+                                 Value="true" />
+                  <Trigger Property="IsMouseOver"
+                                 Value="true">
+                     <Setter Property="Fill"
+                                   Value="#888888"
+                                   TargetName="IconArrowIncreasePath" />
+                  </Trigger>
+                  <Trigger Property="IsPressed"
+                                 Value="true" />
+                  <Trigger Property="IsEnabled"
+                                 Value="false">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="IconArrowIncreasePath" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ScrollBarButtonLeft"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Grid>
+                  <Border x:Name="Border"
+                                Background="Transparent" />
+                  <Path x:Name="IconArrowLeftPath"
+                              Data="M 331,327.42242431640625 C331,327.42242431640625 335,331 335,331 335,331 335,324 335,324 335,324 331,327.42242431640625 331,327.42242431640625 z"
+                              Stretch="Uniform"
+                              Height="7"
+                              Width="4"
+                              Fill="#FFCECECE" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsKeyboardFocused"
+                                 Value="true" />
+                  <Trigger Property="IsMouseOver"
+                                 Value="true">
+                     <Setter Property="Fill"
+                                   Value="#888888"
+                                   TargetName="IconArrowLeftPath" />
+                  </Trigger>
+                  <Trigger Property="IsPressed"
+                                 Value="true" />
+                  <Trigger Property="IsEnabled"
+                                 Value="false">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="IconArrowLeftPath" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ScrollBarButtonRight"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Grid>
+                  <Border x:Name="Border"
+                                Background="Transparent" />
+                  <Path x:Name="IconArrowRightPath"
+                              Data="M 343,327.57757568359375 C343,327.57757568359375 339,324 339,324 339,324 339,331 339,331 339,331 343,327.57757568359375 343,327.57757568359375 z"
+                              Height="7"
+                              Width="4"
+                              Stretch="Uniform"
+                              Fill="#FFCECECE" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsKeyboardFocused"
+                                 Value="true" />
+                  <Trigger Property="IsMouseOver"
+                                 Value="true">
+                     <Setter Property="Fill"
+                                   Value="#888888"
+                                   TargetName="IconArrowRightPath" />
+                  </Trigger>
+                  <Trigger Property="IsPressed"
+                                 Value="true" />
+                  <Trigger Property="IsEnabled"
+                                 Value="false">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="IconArrowRightPath" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="VerticalScrollBarPageButton"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Background"
+                    Value="Transparent" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Rectangle Fill="Transparent"
+                                Height="{TemplateBinding Height}"
+                                Width="{TemplateBinding Width}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ScrollBarThumbHorizontal"
+                TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Grid x:Name="Grid"
+                           Margin="0,0,0,0">
+                  <Rectangle HorizontalAlignment="Stretch"
+                                   x:Name="Rectangle"
+                                   Opacity="1"
+                                   VerticalAlignment="Stretch"
+                                   Width="Auto"
+                                   Height="Auto"
+                                   Fill="#FFCECECE" />
+
+                  <Rectangle HorizontalAlignment="Stretch"
+                                   x:Name="RectangleOver"
+                                   Opacity="0"
+                                   VerticalAlignment="Stretch"
+                                   Width="Auto"
+                                   Height="Auto"
+                                   Fill="#888888" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused"
+                                 Value="True" />
+                  <Trigger Property="IsMouseOver"
+                                 Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="RectangleOver"
+                                                     Storyboard.TargetProperty="Opacity"
+                                                     To="1"
+                                                     Duration="00:00:00.3" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="RectangleOver"
+                                                     Storyboard.TargetProperty="Opacity"
+                                                     To="0"
+                                                     Duration="00:00:00.3" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.ExitActions>
+                  </Trigger>
+                  <Trigger Property="IsEnabled"
+                                 Value="False">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="Rectangle" />
+                  </Trigger>
+                  <Trigger Property="IsDragging"
+                                 Value="True" />
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ScrollBarThumbVertical"
+                TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Grid x:Name="Grid"
+                           Margin="0,0,0,0">
+                  <Rectangle HorizontalAlignment="Stretch"
+                                   x:Name="Rectangle"
+                                   Opacity="1"
+                                   VerticalAlignment="Stretch"
+                                   Width="Auto"
+                                   Height="Auto"
+                                   Fill="#FFCECECE" />
+
+                  <Rectangle HorizontalAlignment="Stretch"
+                                   x:Name="RectangleOver"
+                                   Opacity="0"
+                                   VerticalAlignment="Stretch"
+                                   Width="Auto"
+                                   Height="Auto"
+                                   Fill="#888888" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused"
+                                 Value="True" />
+                  <Trigger Property="IsMouseOver"
+                                 Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="RectangleOver"
+                                                     Storyboard.TargetProperty="Opacity"
+                                                     To="1"
+                                                     Duration="00:00:00.3" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <DoubleAnimation Storyboard.TargetName="RectangleOver"
+                                                     Storyboard.TargetProperty="Opacity"
+                                                     To="0"
+                                                     Duration="00:00:00.3" />
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </Trigger.ExitActions>
+                  </Trigger>
+                  <Trigger Property="IsEnabled"
+                                 Value="False">
+                     <Setter Property="Opacity"
+                                   Value="0.5"
+                                   TargetName="Rectangle" />
+                  </Trigger>
+                  <Trigger Property="IsDragging"
+                                 Value="True" />
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <LinearGradientBrush x:Key="HorizontalScrollBarBackground"
+                              EndPoint="0,1"
+                              StartPoint="0,0">
+      <GradientStop Color="#E1E1E1"
+                          Offset="0" />
+      <GradientStop Color="#EDEDED"
+                          Offset="0.20" />
+      <GradientStop Color="#EDEDED"
+                          Offset="0.80" />
+      <GradientStop Color="#E3E3E3"
+                          Offset="1" />
+   </LinearGradientBrush>
+   <Style x:Key="HorizontalScrollBarPageButton"
+                TargetType="{x:Type RepeatButton}">
+      <Setter Property="OverridesDefaultStyle"
+                    Value="true" />
+      <Setter Property="Background"
+                    Value="Transparent" />
+      <Setter Property="Focusable"
+                    Value="false" />
+      <Setter Property="IsTabStop"
+                    Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Rectangle Fill="Transparent"
+                                Height="{TemplateBinding Height}"
+                                Width="{TemplateBinding Width}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+   <Style x:Key="ScrollBarStyle" TargetType="{x:Type ScrollBar}">
+      <Setter Property="Background"
+                    Value="{StaticResource VerticalScrollBarBackground}" />
+      <Setter Property="Stylus.IsPressAndHoldEnabled"
+                    Value="false" />
+      <Setter Property="Stylus.IsFlicksEnabled"
+                    Value="false" />
+      <Setter Property="Foreground"
+                    Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Width"
+                    Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
+      <Setter Property="MinWidth"
+                    Value="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ScrollBar}">
+               <Grid x:Name="Bg"
+                           SnapsToDevicePixels="true">
+                  <Grid.RowDefinitions>
+                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                     <RowDefinition Height="0.00001*" />
+                     <RowDefinition MaxHeight="{DynamicResource {x:Static SystemParameters.VerticalScrollBarButtonHeightKey}}" />
+                  </Grid.RowDefinitions>
+                  <RepeatButton Command="{x:Static ScrollBar.LineUpCommand}"
+                                      Style="{StaticResource ScrollBarButtonUp}" />
+                  <Track x:Name="PART_Track"
+                               IsDirectionReversed="true"
+                               Grid.Row="1">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Command="{x:Static ScrollBar.PageUpCommand}"
+                                            Style="{StaticResource VerticalScrollBarPageButton}" />
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Command="{x:Static ScrollBar.PageDownCommand}"
+                                            Style="{StaticResource VerticalScrollBarPageButton}" />
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource ScrollBarThumbVertical}"                                     
+                                     Width="7" />
+                     </Track.Thumb>
+                  </Track>
+                  <RepeatButton Command="{x:Static ScrollBar.LineDownCommand}"
+                                      Grid.Row="2"
+                                      Style="{StaticResource ScrollBarButtonDown}" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled"
+                                 Value="false">
+                     <Setter Property="Background"
+                                   TargetName="Bg"
+                                   Value="{StaticResource ScrollBarDisabledBackground}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Style.Triggers>
+         <Trigger Property="Orientation"
+                        Value="Horizontal">
+            <Setter Property="Width"
+                          Value="Auto" />
+            <Setter Property="MinWidth"
+                          Value="0" />
+            <Setter Property="Height"
+                          Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" />
+            <Setter Property="MinHeight"
+                          Value="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarHeightKey}}" />
+            <Setter Property="Background"
+                          Value="{StaticResource HorizontalScrollBarBackground}" />
+            <Setter Property="Template">
+               <Setter.Value>
+                  <ControlTemplate TargetType="{x:Type ScrollBar}">
+                     <Grid x:Name="Bg"
+                                 SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                           <ColumnDefinition Width="0.00001*" />
+                           <ColumnDefinition MaxWidth="{DynamicResource {x:Static SystemParameters.HorizontalScrollBarButtonWidthKey}}" />
+                        </Grid.ColumnDefinitions>
+                        <RepeatButton Command="{x:Static ScrollBar.LineLeftCommand}"
+                                            Style="{StaticResource ScrollBarButtonLeft}" />
+                        <Track x:Name="PART_Track"
+                                     Grid.Column="1">
+                           <Track.DecreaseRepeatButton>
+                              <RepeatButton Command="{x:Static ScrollBar.PageLeftCommand}"
+                                                  Style="{StaticResource HorizontalScrollBarPageButton}" />
+                           </Track.DecreaseRepeatButton>
+                           <Track.IncreaseRepeatButton>
+                              <RepeatButton Command="{x:Static ScrollBar.PageRightCommand}"
+                                                  Style="{StaticResource HorizontalScrollBarPageButton}" />
+                           </Track.IncreaseRepeatButton>
+                           <Track.Thumb>
+                              <Thumb Style="{StaticResource ScrollBarThumbHorizontal}"                                           
+                                           Height="7" />
+                           </Track.Thumb>
+                        </Track>
+                        <RepeatButton Grid.Column="2"
+                                            Command="{x:Static ScrollBar.LineRightCommand}"
+                                            Style="{StaticResource ScrollBarButtonRight}" />
+                     </Grid>
+                     <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled"
+                                       Value="false">
+                           <Setter Property="Background"
+                                         TargetName="Bg"
+                                         Value="{StaticResource ScrollBarDisabledBackground}" />
+                        </Trigger>
+                     </ControlTemplate.Triggers>
+                  </ControlTemplate>
+               </Setter.Value>
+            </Setter>
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <!--**************************
+    * STYLE: ScrollViewer
+    ************************** -->
+   <Style TargetType="ScrollViewer"
+          x:Key="LiveExplorerScrollViewerStyle">
+      <Style.Resources>
+         <Style TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource ScrollBarStyle}" />
+      </Style.Resources>
+
+      <Setter Property="HorizontalContentAlignment"
+              Value="Left" />
+
+      <Setter Property="VerticalContentAlignment"
+              Value="Top" />
+
+      <Setter Property="VerticalScrollBarVisibility"
+              Value="Visible" />
+
+      <Setter Property="BorderBrush"
+              Value="Transparent" />
+
+      <Setter Property="BorderThickness"
+              Value="0" />
+
+      <Setter Property="Background"
+              Value="Transparent" />
+   </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
new file mode 100644
index 000000000..dfb8bee8c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
@@ -0,0 +1,27 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <!-- Header in samples -->
+   <Style x:Key="Header" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="18" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+      <Setter Property="Foreground" Value="#FFEFAC27" />
+      <Setter Property="Margin" Value="0,5" />
+   </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png
new file mode 100644
index 000000000..ee32c0163
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/xceed_logo.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book--pencil.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book--pencil.png
new file mode 100644
index 000000000..7abf41ac9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book--pencil.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book-open.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book-open.png
new file mode 100644
index 000000000..621ca4024
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/address-book-open.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/alarm-clock-blue.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/alarm-clock-blue.png
new file mode 100644
index 000000000..4821bf490
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/alarm-clock-blue.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/document.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/document.png
new file mode 100644
index 000000000..75f92b0c7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/document.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/property-blue.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/property-blue.png
new file mode 100644
index 000000000..2c63f2f1d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Images/property-blue.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
new file mode 100644
index 000000000..b57f6743e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml
@@ -0,0 +1,137 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views.AvalonDockView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:xcad="http://schemas.xceed.com/wpf/xaml/avalondock"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 Title="ButtonSpinner">
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+         The AvalonDock layout system allows developers to create customizable layouts using a window docking system similar to what is found in many popular integrated development environements.
+      </Paragraph>
+   </local:DemoView.Description>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+       <GroupBox Header="Features"
+                  Grid.Row="0"
+                  Margin="5">
+           <StackPanel Orientation="Horizontal" Margin="5">
+               <TextBlock Text="Theme:" Margin="0,0,10,0" VerticalAlignment="Center"/>
+               <ComboBox x:Name="_themeCombo" SelectedIndex="0" Width="125">
+                  <ComboBoxItem Content="Generic" />
+                  <ComboBoxItem Content="Aero">
+                     <ComboBoxItem.Tag>
+                        <xcad:AeroTheme />
+                     </ComboBoxItem.Tag>
+                  </ComboBoxItem>
+                  <ComboBoxItem Content="VS2010">
+                     <ComboBoxItem.Tag>
+                        <xcad:VS2010Theme />
+                     </ComboBoxItem.Tag>
+                  </ComboBoxItem>
+                  <ComboBoxItem Content="Metro">
+                     <ComboBoxItem.Tag>
+                        <xcad:MetroTheme />
+                     </ComboBoxItem.Tag>
+                  </ComboBoxItem>
+               </ComboBox>
+          </StackPanel>
+       </GroupBox>
+
+     <TextBlock Grid.Row="1" Text="Usage:" Style="{StaticResource Header}" />
+
+      <xcad:DockingManager Grid.Row="2" MaxHeight="425"
+                           AllowMixedOrientation="True"
+                           BorderBrush="Black"
+                           BorderThickness="1"
+                           Theme="{Binding ElementName=_themeCombo, Path=SelectedItem.Tag}">
+         <xcad:DockingManager.DocumentHeaderTemplate>
+            <DataTemplate>
+               <StackPanel Orientation="Horizontal">
+                  <Image Source="{Binding IconSource}" Margin="0,0,4,0"/>
+                  <TextBlock Text="{Binding Title}" />
+               </StackPanel>
+            </DataTemplate>
+         </xcad:DockingManager.DocumentHeaderTemplate>
+         <xcad:LayoutRoot x:Name="_layoutRoot">
+            <xcad:LayoutPanel Orientation="Horizontal">
+               <xcad:LayoutAnchorablePane DockWidth="200">
+                  <xcad:LayoutAnchorable ContentId="properties" Title="Properties" CanHide="False" CanClose="False"
+                                            AutoHideWidth="240"
+                                         IconSource="../Images/property-blue.png">
+                     <xctk:PropertyGrid NameColumnWidth="110"
+                        SelectedObject="{Binding ElementName=_layoutRoot, Path=LastFocusedDocument.Content}"/>
+                  </xcad:LayoutAnchorable>
+               </xcad:LayoutAnchorablePane>
+               <xcad:LayoutDocumentPaneGroup >
+                  <xcad:LayoutDocumentPane>
+                     <xcad:LayoutDocument ContentId="document1" Title="Document 1" IconSource="../Images/document.png" >
+                           <Button Content="Document 1 Content" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                     </xcad:LayoutDocument>
+                     <xcad:LayoutDocument ContentId="document2" Title="Document 2" IconSource="../Images/document.png">
+                        <TextBox Text="Document 2 Content" AcceptsReturn="True"/>
+                     </xcad:LayoutDocument>
+                  </xcad:LayoutDocumentPane>
+               </xcad:LayoutDocumentPaneGroup >
+               <xcad:LayoutAnchorablePaneGroup DockWidth="125">
+                  <xcad:LayoutAnchorablePane>
+                     <xcad:LayoutAnchorable ContentId="alarms" Title="Alarms" IconSource="../Images/alarm-clock-blue.png" >
+                        <ListBox>
+                           <s:String>Alarm 1</s:String>
+                           <s:String>Alarm 2</s:String>
+                           <s:String>Alarm 3</s:String>
+                        </ListBox>
+                     </xcad:LayoutAnchorable>
+                     <xcad:LayoutAnchorable ContentId="journal" Title="Journal" >
+                        <RichTextBox>
+                           <FlowDocument>
+                              <Paragraph FontSize="14" FontFamily="Segoe">
+                                 This is the content of the Journal Pane.
+                                 <LineBreak/>
+                                 A
+                                 <Bold>RichTextBox</Bold> has been added here
+                              </Paragraph>
+                           </FlowDocument>
+                        </RichTextBox>
+                     </xcad:LayoutAnchorable>
+                  </xcad:LayoutAnchorablePane>
+               </xcad:LayoutAnchorablePaneGroup>
+            </xcad:LayoutPanel>
+
+            <xcad:LayoutRoot.LeftSide>
+               <xcad:LayoutAnchorSide>
+                  <xcad:LayoutAnchorGroup>
+                     <xcad:LayoutAnchorable Title="Agenda" ContentId="agenda" IconSource="../Images/address-book-open.png">
+                        <TextBlock Text="Agenda Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
+                     </xcad:LayoutAnchorable>
+                     <xcad:LayoutAnchorable Title="Contacts" ContentId="contacts" IconSource="../Images/address-book--pencil.png" >
+                        <TextBlock Text="Contacts Content" Margin="10" FontSize="18" FontWeight="Black" TextWrapping="Wrap"/>
+                     </xcad:LayoutAnchorable>
+                  </xcad:LayoutAnchorGroup>
+               </xcad:LayoutAnchorSide>
+            </xcad:LayoutRoot.LeftSide>
+         </xcad:LayoutRoot>
+      </xcad:DockingManager>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
new file mode 100644
index 000000000..2c3a044fe
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockView.xaml.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views
+{
+  /// <summary>
+  /// Interaction logic for AvalonDockView.xaml
+  /// </summary>
+  public partial class AvalonDockView : DemoView
+  {
+    public AvalonDockView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
new file mode 100644
index 000000000..d7ea1fd51
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Converters/IntegerToTimespanConverter.cs
@@ -0,0 +1,36 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters
+{
+  public class IntegerToTimespanConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return TimeSpan.FromMilliseconds( ( int )value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Images/CdBurning32.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Images/CdBurning32.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Images/CdBurning32.png
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Images/CdBurning32.png
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
new file mode 100644
index 000000000..e8836f210
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Resources/Common.xaml
@@ -0,0 +1,57 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
+
+   <DataTemplate x:Key="SampleContent">
+      <Grid Margin="10">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+         <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+         <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+         <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+         <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+         <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+         <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+         <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+         <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+         <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+         <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+            <Button Width="65" Margin="2">OK</Button>
+            <Button Width="65" Margin="2">Cancel</Button>
+         </StackPanel>
+      </Grid>
+   </DataTemplate>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
new file mode 100644
index 000000000..65175ce79
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
@@ -0,0 +1,73 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views.BusyIndicatorCustomContentTemplateView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator Custom Content Template">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/BusyIndicator/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </local:DemoView.Resources>
+
+   <StackPanel Grid.Row="1" Margin="10">
+      <TextBlock Grid.Row="2" Text="Custom Content Template:" Style="{StaticResource Header}" />
+      <xctk:BusyIndicator IsBusy="True">
+         <xctk:BusyIndicator.BusyContentTemplate>
+            <DataTemplate>
+               <StackPanel Margin="4">
+                  <TextBlock Text="Downloading Email" FontWeight="Bold" HorizontalAlignment="Center" />
+                  <StackPanel Margin="4">
+                     <TextBlock Text="Downloading message 4/10..." />
+                     <ProgressBar Value="40" Height="15" />
+                  </StackPanel>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition/>
+                     </Grid.ColumnDefinitions>
+                     <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Right" Margin="0 0 2 0" />
+                     <Button Grid.Column="1" Content="Cancel" HorizontalAlignment="Left" Margin="2 0 0 0" />
+                  </Grid>
+               </StackPanel>
+            </DataTemplate>
+         </xctk:BusyIndicator.BusyContentTemplate>
+         <xctk:BusyIndicator.OverlayStyle>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="#B1EB1D1D" />
+            </Style>
+         </xctk:BusyIndicator.OverlayStyle>
+         <xctk:BusyIndicator.ProgressBarStyle>
+            <Style TargetType="ProgressBar">
+               <Setter Property="Visibility" Value="Collapsed" />
+            </Style>
+         </xctk:BusyIndicator.ProgressBarStyle>
+
+         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+      </xctk:BusyIndicator>
+   </StackPanel>
+</local:DemoView>
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
new file mode 100644
index 000000000..ffdbdebb0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentTemplateView.xaml
+  /// </summary>
+  public partial class BusyIndicatorCustomContentTemplateView : DemoView
+  {
+    public BusyIndicatorCustomContentTemplateView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
new file mode 100644
index 000000000..a48a9c6fb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
@@ -0,0 +1,51 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views.BusyIndicatorCustomContentView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator Custom Content">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            This example demonstrates how to define your own custom content. This is done by setting the BusyContent property.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/BusyIndicator/Resources/Common.xaml" />
+        </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </local:DemoView.Resources>
+
+   <StackPanel Margin="10">
+      <TextBlock Text="Custom Content:" Style="{StaticResource Header}" />
+      <xctk:BusyIndicator IsBusy="True">
+         <xctk:BusyIndicator.BusyContent>
+            <StackPanel Orientation="Horizontal">
+               <Image Source="pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/BusyIndicator/Images/CdBurning32.png" />
+               <StackPanel Margin="5,0">
+                  <TextBlock Text="Burning CD..." VerticalAlignment="Center" />
+                  <TextBlock Text="Madonna - Like a Virgin" VerticalAlignment="Center" Margin="8,0" />
+               </StackPanel>
+            </StackPanel>
+         </xctk:BusyIndicator.BusyContent>
+         <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+      </xctk:BusyIndicator>
+   </StackPanel>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
new file mode 100644
index 000000000..3c391be43
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentView.xaml
+  /// </summary>
+  public partial class BusyIndicatorCustomContentView : DemoView
+  {
+    public BusyIndicatorCustomContentView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
new file mode 100644
index 000000000..a4ce3b250
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml
@@ -0,0 +1,75 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views.BusyIndicatorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="BusyIndicator">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            BusyIndicator makes it easy to let the user know when an application is busy. Simply wrap the relevant content in an instance of the BusyIndicator control and toggle its IsBusy property to True during any long-running process.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/BusyIndicator/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+         <conv:IntegerToTimespanConverter x:Key="TimeSpanConverter" />
+      </ResourceDictionary>
+   </local:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="IsBusy:" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_isBusy" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true shows the BusyIndicator" />
+
+            <TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
+               <xctk:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Text="0" DefaultValue="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
+               <TextBlock Text="milliseconds" Margin="5,0"  VerticalAlignment="Center" />
+            </StackPanel>
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:BusyIndicator IsBusy="{Binding IsChecked, ElementName=_isBusy}" DisplayAfter="{Binding Value, ElementName=_displayAfter, Converter={StaticResource TimeSpanConverter}}">
+            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+         </xctk:BusyIndicator>
+      </StackPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
new file mode 100644
index 000000000..7878ea1d4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/BusyIndicator/Views/BusyIndicatorView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views
+{
+  /// <summary>
+  /// Interaction logic for BusyIndicatorView.xaml
+  /// </summary>
+  public partial class BusyIndicatorView: DemoView
+  {
+    public BusyIndicatorView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
new file mode 100644
index 000000000..8462f9ce7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml
@@ -0,0 +1,84 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views.ButtonSpinnerView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 Title="ButtonSpinner">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+
+      <x:Array x:Key="names" Type="s:String">
+         <s:String>John Smith</s:String>
+         <s:String>Janel Leverling</s:String>
+         <s:String>Laura Callahan</s:String>
+         <s:String>Robert King</s:String>
+         <s:String>Margaret Peacock</s:String>
+         <s:String>Andrew Fuller</s:String>
+         <s:String>Anne Dodsworth</s:String>
+         <s:String>Nancy Davolio</s:String>
+         <s:String>Naomi Suyama</s:String>
+      </x:Array>       
+   </local:DemoView.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="AllowSpin:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_allowSpin" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true allows the ButtonSpinner to perform increment/decrement operations." />
+
+            <TextBlock Text="ShowButtonSpinner:" VerticalAlignment="Center" Grid.Row="1" />
+            <CheckBox x:Name="_showButtonSpinner" Grid.Row="1" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the visibility of the button spinners." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can wrap any element by placing it inside the content area of the ButtonSpinner control."
+                    TextWrapping="Wrap" />
+
+         <xctk:ButtonSpinner Margin="10" 
+                             Width="150" 
+                             HorizontalAlignment="Left"
+                             AllowSpin="{Binding IsChecked, ElementName=_allowSpin}"
+                             ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner}"
+                             Spin="ButtonSpinner_Spin">
+            <TextBox Text="John Smith" IsReadOnly="True" BorderThickness="0" HorizontalContentAlignment="Right" />
+         </xctk:ButtonSpinner>
+      </StackPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
new file mode 100644
index 000000000..a23a22009
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/ButtonSpinnerView.xaml.cs
@@ -0,0 +1,54 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
+{
+  /// <summary>
+  /// Interaction logic for ButtonSpinnerView.xaml
+  /// </summary>
+  public partial class ButtonSpinnerView : DemoView
+  {
+    public ButtonSpinnerView()
+    {
+      InitializeComponent();
+    }
+
+    private void ButtonSpinner_Spin( object sender, SpinEventArgs e )
+    {
+      String[] names = (String[])this.Resources[ "names" ];
+
+      ButtonSpinner spinner = ( ButtonSpinner )sender;
+      TextBox txtBox = ( TextBox )spinner.Content;
+
+      int value = Array.IndexOf( names, txtBox.Text );
+      if( e.Direction == SpinDirection.Increase )
+        value++;
+      else
+        value--;
+
+      if( value < 0 )
+        value = names.Length - 1;
+      else if( value >= names.Length )
+        value = 0;
+
+      txtBox.Text = names[ value ];
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
new file mode 100644
index 000000000..0ac318ae4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml
@@ -0,0 +1,74 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views.DropDownSplitButtonView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="DropDown and Split Buttons">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within.</Run>
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+        <Grid.RowDefinitions>
+           <RowDefinition Height="Auto" />
+           <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+
+         <TextBlock Text="DropDownButton Usage:" Style="{StaticResource Header}" />
+         <xctk:DropDownButton x:Name="_dropDownButton"
+                              Grid.Row="1"
+                              Margin="10"
+                              Width="150"
+                              HorizontalAlignment="Left"
+                              Content="Click Me"
+                              Click="DropDownButton_Click">
+            <xctk:DropDownButton.DropDownContent>
+               <StackPanel>
+                  <xctk:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </xctk:DropDownButton.DropDownContent>
+         </xctk:DropDownButton>
+
+         <TextBlock Text="SplitButton Usage:" Grid.Column="1" Style="{StaticResource Header}" />
+         <xctk:SplitButton x:Name="_splitButton"
+                           Grid.Row="1"
+                           Grid.Column="1"
+                           Margin="10"
+                           Width="150"
+                           HorizontalAlignment="Left"
+                           Content="Click Me"
+                           Click="SplitButton_Click">
+            <xctk:SplitButton.DropDownContent>
+               <StackPanel>
+                  <xctk:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </xctk:SplitButton.DropDownContent>
+         </xctk:SplitButton>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
new file mode 100644
index 000000000..452fbcc17
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Button/Views/DropDownSplitButtonView.xaml.cs
@@ -0,0 +1,45 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
+{
+  /// <summary>
+  /// Interaction logic for DropDownSplitButtonView.xaml
+  /// </summary>
+  public partial class DropDownSplitButtonView : DemoView
+  {
+    public DropDownSplitButtonView()
+    {
+      InitializeComponent();
+    }
+
+    private void DropDownButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      _dropDownButton.IsOpen = false;
+      _splitButton.IsOpen = false;
+    }
+
+    private void SplitButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      Xceed.Wpf.Toolkit.MessageBox.Show( "Thanks for clicking me!", "SplitButton Click" );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
new file mode 100644
index 000000000..4bb2474f4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml
@@ -0,0 +1,57 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Calculator.Views.CalculatorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Calculator">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The Calculator is a control used for performing mathematical calculations.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Precision(decimal places): " VerticalAlignment="Center" />
+            <xctk:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0" />
+         <xctk:Calculator Margin="10" Width="250" Precision="{Binding Value, ElementName=_precision}" />
+      </StackPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
new file mode 100644
index 000000000..c639cce38
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Calculator/Views/CalculatorView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Calculator.Views
+{
+  /// <summary>
+  /// Interaction logic for CalculatorView.xaml
+  /// </summary>
+  public partial class CalculatorView : DemoView
+  {
+    public CalculatorView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
new file mode 100644
index 000000000..d438e0ef6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Converters/GraduationModeToComboBoxConverter.cs
@@ -0,0 +1,30 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters
+{
+
+
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartAxis.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartAxis.png
new file mode 100644
index 000000000..a33d8a87f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartAxis.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartBasicTypes.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartBasicTypes.png
new file mode 100644
index 000000000..86c0c9a76
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartBasicTypes.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartLegend.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartLegend.png
new file mode 100644
index 000000000..056d2adf2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartLegend.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartSeriesDataPointsBinding.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartSeriesDataPointsBinding.png
new file mode 100644
index 000000000..244356b81
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartSeriesDataPointsBinding.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingAxesGrid.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingAxesGrid.png
new file mode 100644
index 000000000..46e6fa8bc
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingAxesGrid.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingColumnSeries.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingColumnSeries.png
new file mode 100644
index 000000000..36dfa2b2d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingColumnSeries.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingLineSeries.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingLineSeries.png
new file mode 100644
index 000000000..07ca989c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingLineSeries.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingPieSeries.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingPieSeries.png
new file mode 100644
index 000000000..1adc26163
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/OpenSourceImages/ChartStylingPieSeries.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/1.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/1.bmp
new file mode 100644
index 000000000..1c17a46b7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/1.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/2.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/2.bmp
new file mode 100644
index 000000000..2b47be4ef
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/2.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/3.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/3.bmp
new file mode 100644
index 000000000..42ff08bdf
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/3.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/4.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/4.bmp
new file mode 100644
index 000000000..831f88bd1
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/4.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/5.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/5.bmp
new file mode 100644
index 000000000..d7577a523
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/5.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/6.bmp b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/6.bmp
new file mode 100644
index 000000000..da9267223
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Photo/6.bmp differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
new file mode 100644
index 000000000..9b85e3887
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml
@@ -0,0 +1,54 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartAxisView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                x:Name="_demo"
+                Title="Chart Axis">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The chart's Axis class represents the x- and y-axis of an area (Area class) in a chart. They can be individually configured with many properties.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartAxis.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
new file mode 100644
index 000000000..98b3b5cdc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartAxisView.xaml.cs
@@ -0,0 +1,58 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System;
+using System.Diagnostics;
+using System.Windows;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartAxisView.xaml
+  /// </summary>
+  public partial class ChartAxisView : DemoView
+  {
+
+
+
+
+
+
+
+
+
+    #region Initialization
+
+    public ChartAxisView()
+    {
+      InitializeComponent();
+    }
+
+    #endregion
+
+
+
+
+
+
+
+    #region Implementation
+
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
new file mode 100644
index 000000000..20199fcf3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
@@ -0,0 +1,52 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartLegendView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Legend">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The chart control contains a collection of areas which each contain a collection of series. A single legend will combine all the series from all the areas in one place. Here, 2 areas are used to display 2 series.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>A legend can be moved around, resized, and docked. Please note that a legend can be resized only when its Dock property is set to Float and if the AllowResize property is set to true.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartLegend.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
new file mode 100644
index 000000000..65a2c271a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml.cs
@@ -0,0 +1,31 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************/
+
+using System.Windows.Media;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartLegendView.xaml
+  /// </summary>
+  public partial class ChartLegendView : DemoView
+  {
+    public ChartLegendView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
new file mode 100644
index 000000000..818c380ad
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml
@@ -0,0 +1,51 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartSeriesBasicTypesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Series Basic Types">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>A series contains DataPoint objects and are layed out in an area (Area class) of a chart. They can be displayed with predefined layouts, such as column (bar), line, area, or pie, or they can be displayed using a custom layout (not implemented in this sample).</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartBasicTypes.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
new file mode 100644
index 000000000..56c042928
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesBasicTypesView.xaml.cs
@@ -0,0 +1,53 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Panels;
+using System;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartSeriesBasicTypesView.xaml
+  /// </summary>
+  public partial class ChartSeriesBasicTypesView : DemoView
+  {
+
+
+
+    #region Initialization
+
+    public ChartSeriesBasicTypesView()
+    {
+      InitializeComponent();
+    }
+
+    #endregion
+
+
+
+
+
+
+    #region Implementation
+
+
+
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
new file mode 100644
index 000000000..ee2355c4d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml
@@ -0,0 +1,42 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartSeriesDataPointsBindingView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Series DataPoints Binding">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The DataPoint objects of a chart's series can be set by binding with the Series.DataPointsSource property. From there, a DataPointBinding can be set on the X, Y, or Label property of a DataPoint.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xced Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartSeriesDataPointsBinding.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
new file mode 100644
index 000000000..f15446117
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartSeriesDataPointsBindingView.xaml.cs
@@ -0,0 +1,34 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Media;
+using System;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartSeriesDataPointsBindingView.xaml
+  /// </summary>
+  public partial class ChartSeriesDataPointsBindingView : DemoView
+  {
+    public ChartSeriesDataPointsBindingView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
new file mode 100644
index 000000000..762b305d6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml
@@ -0,0 +1,55 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartStylingAxesGridView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Styling Axes Grid">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>This sample shows how AxesGrid elements can be styled using a DataTemplate.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartStylingAxesGrid.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
new file mode 100644
index 000000000..55baf3595
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingAxesGridView.xaml.cs
@@ -0,0 +1,34 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System;
+using System.Windows;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartStylingAxesGridView.xaml
+  /// </summary>
+  public partial class ChartStylingAxesGridView : DemoView
+  {
+    public ChartStylingAxesGridView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
new file mode 100644
index 000000000..2944c24a7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml
@@ -0,0 +1,50 @@
+﻿<!--***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartStylingColumnSeriesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Styling Column Series">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>This sample shows how a series with a column layout type and a legend can be styled using DataTemplates.</Run>
+
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartStylingColumnSeries.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
new file mode 100644
index 000000000..22dda40d3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingColumnSeriesView.xaml.cs
@@ -0,0 +1,32 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartStylingColumnSeriesView.xaml
+  /// </summary>
+  public partial class ChartStylingColumnSeriesView : DemoView
+  {
+    public ChartStylingColumnSeriesView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
new file mode 100644
index 000000000..64910fba5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml
@@ -0,0 +1,46 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartStylingLineSeriesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Styling Line Series">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>This sample demonstrates how a series with a line layout type and a legend can be styled via DataTemplates. The legend contains a button to add new DataPoints.</Run>
+
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartStylingLineSeries.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
new file mode 100644
index 000000000..88f7ca1d1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingLineSeriesView.xaml.cs
@@ -0,0 +1,37 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System.Windows;
+using System;
+using System.Diagnostics;
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartStylingLineSeriesView.xaml
+  /// </summary>
+  public partial class ChartStylingLineSeriesView : DemoView
+  {
+    public ChartStylingLineSeriesView()
+    {
+      InitializeComponent();
+    }
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
new file mode 100644
index 000000000..fc22c4dde
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml
@@ -0,0 +1,49 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views.ChartStylingPieSeriesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                Title="Chart Styling Pie Series">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>This sample demonstrates how a series with a pie layout type can be styled via DataTemplates. The series, hint line, and hint label are all styled.</Run>
+
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ChartStylingPieSeries.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
new file mode 100644
index 000000000..5504d5a3a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartStylingPieSeriesView.xaml.cs
@@ -0,0 +1,36 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System;
+using System.Windows.Media.Imaging;
+using System.Windows;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
+{
+  /// <summary>
+  /// Interaction logic for ChartStylingPieSeriesView.xaml
+  /// </summary>
+  public partial class ChartStylingPieSeriesView : DemoView
+  {
+    public ChartStylingPieSeriesView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
new file mode 100644
index 000000000..be51a5bb5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml
@@ -0,0 +1,183 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views.CheckListsView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 x:Name="demo"
+                 Title="Check lists">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The CheckListBox and CheckComboBox controls represent a list of selected items that are displayed as CheckBoxes. Besides the common SelectedItem and SelectedItems properties, these controls give developers more alternatives for managing and handling selections.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <x:Array x:Key="personProperties" Type="s:String">
+         <s:String>ID</s:String>
+         <s:String>FirstName</s:String>
+         <s:String>LastName</s:String>
+      </x:Array>
+   </local:DemoView.Resources>
+
+   <Grid >
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition />
+               <RowDefinition />
+               <RowDefinition />
+               <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Row="0" Grid.Column="0" 
+                       Text="Delimiter:" 
+                       Margin="2,5,5,5"/>
+            <TextBox x:Name="_delimiter" 
+                     Grid.Row="0" Grid.Column="1"
+                     Width="200"
+                     Margin="5"
+                     HorizontalAlignment="Left"
+                     Text="," />
+
+            <TextBlock Grid.Row="1" Grid.Column="0" 
+                       Text="ValueMemberPath:" 
+                       Margin="2,5,5,5"/>
+            <ComboBox x:Name="_valueMemberPath" 
+                     Grid.Row="1" Grid.Column="1"
+                     HorizontalAlignment="Left"
+                     Width="100"
+                     Margin="5"
+                     ItemsSource="{StaticResource personProperties}" 
+                     SelectedIndex="0"/>
+
+            <TextBlock Grid.Row="2" Grid.Column="0" 
+                       Text="SelectedValue:" 
+                       Margin="2,5,5,5"/>
+            <TextBox x:Name="_selectedValue" 
+                     Grid.Row="2" Grid.Column="1"
+                     Width="200"
+                     Margin="5"
+                     HorizontalAlignment="Left"
+                     Text="{Binding ElementName=_checkListBox, Path=SelectedValue, Mode=TwoWay}"/>
+
+            <TextBlock Grid.Row="0" Grid.Column="2" 
+                       Text="SelectedMemberPath:" 
+                       Margin="2,5,5,5"/>
+            <TextBox x:Name="_selectedMemberPath" 
+                     Grid.Row="0" Grid.Column="3"
+                     Margin="5"
+                     Width="125"
+                     HorizontalAlignment="Left"
+                     IsEnabled="False"
+                     Text="IsSelected" />
+
+            <TextBlock Grid.Row="1" Grid.Column="2" 
+                       Text="DisplayMemberPath:" 
+                       Margin="5"/>
+            <ComboBox x:Name="_displayMemberPath" 
+                     Grid.Row="1" Grid.Column="3"
+                     Width="125"
+                     Margin="5"
+                     HorizontalAlignment="Left"
+                     ItemsSource="{StaticResource personProperties}"
+                     SelectedIndex="1"/>
+            <TextBlock Grid.Row="2" Grid.Column="2" 
+                       Text="IsDropDownOpen:" 
+                       Margin="5"/>
+            <CheckBox x:Name="_isDropDownOpen" 
+                     Grid.Row="2" Grid.Column="3"
+                     Margin="5"
+                     HorizontalAlignment="Left"
+                     Content="(CheckComboBox only)"
+                     ClickMode="Press"
+                     IsChecked="{Binding IsDropDownOpen, ElementName=_checkComboBox}" />
+            <TextBlock Grid.Row="3" Grid.Column="2" 
+                       Text="MaxDropDownHeight:" 
+                       Margin="5"/>
+            <StackPanel Orientation="Horizontal"
+                        Grid.Row="3" Grid.Column="3"
+                        HorizontalAlignment="Left"
+                        Margin="5">
+                <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
+                                   Width="45" 
+                                   Value="{Binding MaxDropDownHeight, ElementName=_checkComboBox}"
+                                   DefaultValue="150"
+                                   AllowInputSpecialValues="PositiveInfinity"
+                                   Minimum="0"/>
+                <TextBlock Text="(CheckComboBox only)" 
+                           Margin="4"/>
+            </StackPanel>
+         </Grid>
+      </GroupBox>
+
+      <GroupBox Header="Item Models" Grid.Row="1" Margin="5">
+         <ListBox DisplayMemberPath="ModelDisplay" FontFamily="Global Monospace"
+                  ItemsSource="{Binding}"/>
+      </GroupBox>
+
+      <Grid Grid.Row="2">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <TextBlock Text="CheckListBox Usage:" Margin="5" Style="{StaticResource Header}" />
+         <xctk:CheckListBox x:Name="_checkListBox"
+                            Grid.Column="0"
+                            Grid.Row="1"
+                            Margin="5"
+                            VerticalAlignment="Stretch"
+                            ItemsSource="{Binding}"
+                            Delimiter="{Binding ElementName=_delimiter, Path=Text}"
+                            ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
+                            SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
+                            DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" />
+
+         <TextBlock Text="CheckComboBox Usage:" Grid.Column="1" Margin="5" Style="{StaticResource Header}"/>
+         <xctk:CheckComboBox Grid.Column="1"
+                             x:Name="_checkComboBox"
+                             Grid.Row="1"
+                             Margin="5"
+                             VerticalAlignment="Top"
+                             ItemsSource="{Binding}"
+                             Delimiter="{Binding ElementName=_delimiter, Path=Text}"
+                             ValueMemberPath="{Binding ElementName=_valueMemberPath, Path=SelectedItem}"
+                             SelectedMemberPath="{Binding ElementName=_selectedMemberPath, Path=Text}"
+                             DisplayMemberPath="{Binding ElementName=_displayMemberPath, Path=SelectedItem}" 
+                             IsDropDownOpen="false"
+                             MaxDropDownHeight="100"/>
+        </Grid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
new file mode 100644
index 000000000..80b7378a3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/CheckLists/Views/CheckListsView.xaml.cs
@@ -0,0 +1,129 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views
+{
+  /// <summary>
+  /// Interaction logic for CheckListsView.xaml
+  /// </summary>
+  public partial class CheckListsView : DemoView
+  {
+    public CheckListsView()
+    {
+      InitializeComponent();
+      this.DataContext = new List<Person>()
+      {
+        new Person(){ID=101, FirstName="John", LastName="Smith"},
+        new Person(){ID=102, FirstName="Janel", LastName="Leverling"},
+        new Person(){ID=103, FirstName="Laura", LastName="Callahan"},
+        new Person(){ID=104, FirstName="Robert", LastName="King"},
+        new Person(){ID=105, FirstName="Margaret", LastName="Peacock"},
+        new Person(){ID=106, FirstName="Andrew", LastName="Fuller"},
+        new Person(){ID=107, FirstName="Anne", LastName="Dodsworth"},
+        new Person(){ID=108, FirstName="Nancy", LastName="Davolio"},
+        new Person(){ID=109, FirstName="Naomi", LastName="Suyama"},
+      };
+    }
+
+  }
+
+  public class Person : INotifyPropertyChanged
+  {
+    private bool _isSelected;
+    private int _ID;
+    private string _firstName;
+    private string _lastName;
+
+    public bool IsSelected
+    {
+      get
+      {
+        return _isSelected;
+      }
+      set
+      {
+        _isSelected = value;
+        OnPropertyChanged( "IsSelected" );
+      }
+    }
+
+    public int ID
+    {
+      get
+      {
+        return _ID;
+      }
+      set
+      {
+        _ID = value;
+        OnPropertyChanged( "ID" );
+      }
+    }
+
+    public string FirstName
+    {
+      get
+      {
+        return _firstName;
+      }
+      set
+      {
+        _firstName = value;
+        OnPropertyChanged( "FirstName" );
+      }
+    }
+
+    public string LastName
+    {
+      get
+      {
+        return _lastName;
+      }
+      set
+      {
+        _lastName = value;
+        OnPropertyChanged( "LastName" );
+      }
+    }
+
+    public string ModelDisplay
+    {
+      get
+      {
+        string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20);
+        return string.Format(
+          "ID={0}: Name= {1}, IsSelected= {2}",
+          ID,
+          completeName,
+          IsSelected );
+      }
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected void OnPropertyChanged( string propertyName )
+    {
+      if( PropertyChanged != null )
+      {
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+        PropertyChanged( this, new PropertyChangedEventArgs( "ModelDisplay" ) );
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
new file mode 100644
index 000000000..906ce54d0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml
@@ -0,0 +1,187 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views.ColorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Color">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The ColorCanvas and ColorPicker controls allow the user to input a color. Not shown in the sample are the ColorPicker's Available, Standard and Recent color lists, which are entirely customizable.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+         <Style x:Key="controlInError" TargetType="xctk:IntegerUpDown">
+            <Style.Triggers>
+                <Trigger Property="Validation.HasError" Value="true">
+                    <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
+                            Path=(Validation.Errors).CurrentItem.ErrorContent}" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </local:DemoView.Resources>
+   <Grid >
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="*"/>
+         <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+
+      <Grid Grid.Column="0" Margin="5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Grid.Column="0" Grid.Row="0"
+            Header="ColorCanvas Features"
+            HorizontalAlignment="Stretch" >
+            <Grid>
+               <Grid.Resources>
+                  <Style x:Key="alignStyle" TargetType="{x:Type FrameworkElement}">
+                     <Setter Property="Margin" Value="5"/>
+                  </Style>
+
+                  <Style TargetType="{x:Type TextBlock}" BasedOn="{StaticResource alignStyle}"/>
+                  <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource alignStyle}"/>
+                  <Style TargetType="{x:Type CheckBox}" BasedOn="{StaticResource alignStyle}" />                  
+                  <Style TargetType="{x:Type xctk:IntegerUpDown}" BasedOn="{StaticResource alignStyle}">
+                     <Setter Property="Width" Value="45"/>
+                     <Setter Property="Minimum" Value="0" />
+                     <Setter Property="Maximum" Value="255" />
+                  </Style>                     
+               </Grid.Resources>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="*"/>
+               </Grid.ColumnDefinitions>
+
+               <StackPanel Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"
+                           HorizontalAlignment="Stretch"
+                           Orientation="Horizontal" >
+                  <TextBlock Text="R:"/>
+                  <xctk:IntegerUpDown x:Name="_R" Value="{Binding ElementName=_colorCanvas, Path=R, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
+                  <TextBlock Text="G:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_G" Value="{Binding ElementName=_colorCanvas, Path=G, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
+                  <TextBlock Text="B:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_B" Value="{Binding ElementName=_colorCanvas, Path=B, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
+                  <TextBlock Text="A:" Margin="5"/>
+                  <xctk:IntegerUpDown x:Name="_A" Value="{Binding ElementName=_colorCanvas, Path=A, Mode=TwoWay}" Minimum="0" Maximum="255" Style="{StaticResource controlInError}"/>
+               </StackPanel>
+
+               <TextBlock Grid.Column="0" Grid.Row="1" Text="UsingAlphaChannel: " />
+               <CheckBox Grid.Column="1" Grid.Row="1" x:Name="_usingAlphaChannel" 
+                         IsChecked="{Binding ElementName=_colorCanvas, Path=UsingAlphaChannel, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="2" Text="HexadecimalString: " />
+               <TextBox Grid.Column="1" Grid.Row="2"  IsEnabled="False" 
+                        Text="{Binding ElementName=_colorCanvas, Path=HexadecimalString}"/>
+            </Grid>
+         </GroupBox>
+
+         <TextBlock Text="ColorCanvas Usage: " Grid.Row="1" Margin="0,10,0,0" Style="{StaticResource Header}" />
+         <xctk:ColorCanvas x:Name="_colorCanvas" Grid.Row="2" 
+                           VerticalAlignment="Top"
+                           HorizontalAlignment="Stretch" />
+
+      </Grid>
+
+      <Grid Grid.Column="1" Margin="5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+         </Grid.RowDefinitions>
+
+         <GroupBox Grid.Column="0" Grid.Row="0"
+            Header="ColorPicker Features"
+            HorizontalAlignment="Stretch"
+            Margin="10">
+            <Grid>
+               <Grid.Resources>
+                  <Style TargetType="{x:Type TextBlock}">
+                     <Setter Property="Margin" Value="3" />
+                     <Setter Property="VerticalAlignment" Value="Center" />
+                  </Style>
+                  <Style TargetType="{x:Type TextBox}">
+                     <Setter Property="Margin" Value="3"/>
+                  </Style>
+                  <Style TargetType="{x:Type CheckBox}">
+                     <Setter Property="Margin" Value="3"/>
+                  </Style>
+               </Grid.Resources>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto"/>
+                  <ColumnDefinition Width="*"/>
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Grid.Column="0" Grid.Row="0" Text="AvailableColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="0" Text="{Binding ElementName=_colorPicker, Path=AvailableColorsHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="1" Text="RecentColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="1" Text="{Binding ElementName=_colorPicker, Path=RecentColorsHeader, Mode=TwoWay}" />
+               <TextBlock Grid.Column="0" Grid.Row="2" Text="StandardColorsHeader:" />
+               <TextBox Grid.Column="1" Grid.Row="2" Text="{Binding ElementName=_colorPicker, Path=StandardColorsHeader, Mode=TwoWay}" />
+
+               <CheckBox Grid.Column="0" Grid.Row="3" Grid.ColumnSpan="2" 
+                         Content="DisplayColorAndName" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=DisplayColorAndName, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="4" Grid.ColumnSpan="2" 
+                         Content="ShowAdvancedButton" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAdvancedButton, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="5" Grid.ColumnSpan="2" 
+                         Content="ShowAvailableColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowAvailableColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="6" Grid.ColumnSpan="2" 
+                         Content="ShowDropDownButton" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowDropDownButton, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="7" Grid.ColumnSpan="2" 
+                         Content="ShowRecentColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowRecentColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="8" Grid.ColumnSpan="2" 
+                         Content="ShowStandardColors" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=ShowStandardColors, Mode=TwoWay}"/>
+               <CheckBox Grid.Column="0" Grid.Row="9" Grid.ColumnSpan="2" 
+                         Content="UsingAlphaChannel" 
+                         IsChecked="{Binding ElementName=_colorPicker, Path=UsingAlphaChannel, Mode=TwoWay}"/>
+               <TextBlock Grid.Column="0" Grid.Row="10" Text="SelectedColorText:" />
+               <TextBox Grid.Column="1" Grid.Row="10" IsEnabled="False" Text="{Binding ElementName=_colorPicker, Path=SelectedColorText}" />
+            </Grid>
+         </GroupBox>
+
+         <TextBlock Text="ColorPicker Usage: " Grid.Row="1"  Style="{StaticResource Header}" />
+         <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" VerticalAlignment="Top"/>
+      </Grid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
new file mode 100644
index 000000000..296fda05a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Color/Views/ColorView.xaml.cs
@@ -0,0 +1,34 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views
+{
+  /// <summary>
+  /// Interaction logic for ColorView.xaml
+  /// </summary>
+  public partial class ColorView : DemoView
+  {
+    public ColorView()
+    {
+      InitializeComponent();
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
new file mode 100644
index 000000000..093525ddf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Converters/FlagPathConverter.cs
@@ -0,0 +1,41 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.Samples.SampleData;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters
+{
+  public class FlagPathConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      // Use FlagsProvider to get Flags since it caches every BitmapImages it created.
+      // This optimizes the converter.
+      return FlagsProvider.Instance.GetFlagFromCountryName( value as string );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return DependencyProperty.UnsetValue;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png
new file mode 100644
index 000000000..ab49f3c15
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/OpenSourceImages/MultiColumnsComboBox.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/UniqueIDCellValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
similarity index 75%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/UniqueIDCellValidationRule.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
index 7c8e29fe3..89eadba43 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DataGrid/UniqueIDCellValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/UniqueIDCellValidationRule.cs
@@ -1,21 +1,18 @@
-﻿/************************************************************************
+﻿/**************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter.
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -27,7 +24,7 @@ projects. The commercial version of Extended WPF Toolkit also includes
 using Xceed.Wpf.DataGrid;
 using System.Data;
 
-namespace Samples.Modules.DataGrid
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid
 {
   public class UniqueIDCellValidationRule : CellValidationRule
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
new file mode 100644
index 000000000..c3feacb51
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml
@@ -0,0 +1,182 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.DataGridView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters"
+                 xmlns:compModel="clr-namespace:System.ComponentModel;assembly=WindowsBase"
+                 xmlns:datagrid="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="DataGrid"
+                 x:Name="_demo">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Extended WPF Toolkit includes a powerful and fast datagrid control with many improvements over the stock WPF datagrid. In addition to providing a modern experience with the smooth scrolling and fully animated Tableflow view (can be turned off), it also provides zero-lag background data virtualization. Try a basic sample here. There are too many features and options to showcase in this sample. An even more feature-rich edition of this datagrid is available </Run>
+            <Hyperlink NavigateUri="http://xceed.com/Grid_WPF_Intro.html?adtype=154" RequestNavigate="Hyperlink_RequestNavigate">
+                here.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <xcdg:ImageConverter x:Key="imageConverter" />
+      <!-- Converter used to return a BitmapImage from a Country name -->
+      <conv:FlagPathConverter x:Key="flagPathConverter" />
+
+      <!-- DataTemplate to display an Employee object -->
+      <DataTemplate x:Key="employeeDataTemplate">
+         <Grid MaxHeight="30"
+               VerticalAlignment="Center">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Image Margin="0, 0, 5, 0"
+                   Source="{Binding Photo, Converter={StaticResource imageConverter}, NotifyOnValidationError=False, ValidatesOnDataErrors=False}" />
+
+            <StackPanel Grid.Column="1"
+                        Orientation="Horizontal"
+                        VerticalAlignment="Center">
+               <TextBlock Text="{Binding FirstName, NotifyOnValidationError=False, ValidatesOnDataErrors=False}" />
+               <TextBlock Text=" " />
+               <TextBlock Text="{Binding LastName, NotifyOnValidationError=False, ValidatesOnDataErrors=False}" />
+            </StackPanel>
+         </Grid>
+      </DataTemplate>
+
+       <!-- DataTemplate to display the $ in Freight column -->
+      <DataTemplate x:Key="freightDataTemplate">
+         <TextBlock Text="{Binding StringFormat=\{0:C\}}"
+                    VerticalAlignment="Center" />
+      </DataTemplate>
+
+       <!-- DataTemplate to display a Country -->
+      <DataTemplate x:Key="countryDataTemplate">
+         <StackPanel Orientation="Horizontal"
+                     VerticalAlignment="Center"
+                     Margin="5,0,0,0">
+            <!--The flagPathConverter resource changes the value of a
+                               group (e.g., "Canada") to an image. -->
+            <Image MaxHeight="15"
+                   Margin="0, 0, 5, 0"
+                   Source="{Binding Converter={StaticResource flagPathConverter}}" />
+
+            <TextBlock Text="{Binding}"
+                       TextTrimming="WordEllipsis"
+                       VerticalAlignment="Center" />
+         </StackPanel>
+      </DataTemplate>
+
+   </local:DemoView.Resources>
+
+    <Grid>
+        <Grid.Resources>
+            <xcdg:DataGridCollectionViewSource x:Key="cvsOrders" 
+                                               Source="{Binding}">
+                <xcdg:DataGridCollectionViewSource.GroupDescriptions>
+                    <PropertyGroupDescription PropertyName="ShipCountry" />
+                    <PropertyGroupDescription PropertyName="ShipCity" />
+                </xcdg:DataGridCollectionViewSource.GroupDescriptions>
+            </xcdg:DataGridCollectionViewSource>
+        </Grid.Resources>
+
+        <xcdg:DataGridControl x:Name="_dataGrid"
+                            ItemsSource="{Binding Source={StaticResource cvsOrders}}" >           
+            <xcdg:DataGridControl.View>
+                <xcdg:TableflowView FixedColumnCount="2" />
+            </xcdg:DataGridControl.View>
+
+            <xcdg:DataGridControl.Columns>
+                <xcdg:Column FieldName="OrderID"
+                             Title="Order"
+                             Width="100"
+                             IsMainColumn="True">
+                </xcdg:Column>
+
+                <xcdg:Column FieldName="Employee"
+                             Title="Employee"
+                             Width="160"
+                             CellContentTemplate="{StaticResource employeeDataTemplate}" />
+
+                <xcdg:Column FieldName="Customer.CompanyName"
+                             Title="Customer"
+                             Width="185"/>
+
+                <xcdg:Column FieldName="OrderDate"
+                             Title="Order Date"
+                             Width="120" />
+
+                <xcdg:Column FieldName="Shipper.CompanyName"
+                             Title="Ship Via" />
+
+                <xcdg:Column FieldName="Freight"
+                             Width="100"
+                             CellContentTemplate="{StaticResource freightDataTemplate}"
+                             GroupValueTemplate="{StaticResource freightDataTemplate}"/>
+
+                <xcdg:Column FieldName="ShipCity"
+                             Title="City"
+                             Width="80" />
+
+                <xcdg:Column FieldName="ShipCountry"
+                             Title="Country"
+                             CellContentTemplate="{StaticResource countryDataTemplate}"
+                             GroupValueTemplate="{StaticResource countryDataTemplate}"/>
+
+                <xcdg:Column FieldName="ShipAddress"
+                             Title="Address"
+                             Width="200" />
+
+                <xcdg:Column FieldName="ShipPostalCode"
+                             Title="Postal Code"
+                             Width="120" />
+
+                <xcdg:Column FieldName="RequiredDate"
+                             Title="Required Date"
+                             Width="140" />
+
+                <xcdg:Column FieldName="ShippedDate"
+                             Title="Shipped Date"
+                             Width="140" />               
+
+                <xcdg:Column FieldName="ShipName"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="ShipRegion"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="EmployeeID"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="CustomerID"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="Customer"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="ShipVia"
+                              Visible="False" />
+
+                <xcdg:Column FieldName="Shipper"
+                              Visible="False" />
+            </xcdg:DataGridControl.Columns>
+        </xcdg:DataGridControl>
+    </Grid>
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml.cs
new file mode 100644
index 000000000..b678cdba0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/DataGridView.xaml.cs
@@ -0,0 +1,36 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Data;
+using Xceed.Wpf.DataGrid;
+using System.Diagnostics;
+using Xceed.Wpf.Samples.SampleData;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for DataGridView.xaml
+  /// </summary>
+  public partial class DataGridView : DemoView
+  {
+    public DataGridView()
+    {
+      this.DataContext = SampleDataProvider.GetOrders();
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
new file mode 100644
index 000000000..bffc935a2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml
@@ -0,0 +1,48 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views.MultiColumnComboBoxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters"
+                 x:Name="_demo"
+                 Title="Multi-Column ComboBox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The multi-column combo box uses the power of Xceed's datagrid control to create an advanced ComboBox.</Run>
+            <LineBreak />
+            <Run>This Control is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\MultiColumnsComboBox.png" Width="500" Height="300"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml.cs
new file mode 100644
index 000000000..699fac523
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DataGrid/Views/MultiColumnComboBoxView.xaml.cs
@@ -0,0 +1,38 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Data;
+using Xceed.Wpf.DataGrid;
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Data;
+using Xceed.Wpf.Samples.SampleData;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for MultiColumnComboBox.xaml
+  /// </summary>
+  public partial class MultiColumnComboBoxView : DemoView
+  {
+    public MultiColumnComboBoxView()
+    {
+      InitializeComponent();
+    }
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
new file mode 100644
index 000000000..980b09075
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Converters/DateTimeToTimeSpanConverter.cs
@@ -0,0 +1,42 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters
+{
+  public class DateTimeToTimeSpanConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( value is System.DateTime )
+      {
+        System.DateTime time = (System.DateTime)value;
+        return new TimeSpan( time.Hour, time.Minute, 0 );
+      }
+      return value;
+    }
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
new file mode 100644
index 000000000..8e7b702d3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml
@@ -0,0 +1,138 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views.DateTimeView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters"
+                 Title="DateTime">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+        <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
+
+        <ObjectDataProvider x:Key="enumTimeFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="xctk:TimeFormat"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:DateTimeFormat"/>
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+   </local:DemoView.Resources>
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+
+      <GroupBox Header="Features" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" >
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Format:" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
+            <ComboBox x:Name="_format" Grid.Row="0" Grid.Column="1" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5,5,25,5"/>
+            <TextBlock Text="FormatString:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" />
+            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="190" Margin="5,5,25,5"/>
+            <TextBlock Text="Watermark:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"/>
+            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5,5,25,5"/>  
+            <TextBlock Text="AutoCloseCalendar:" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"/>
+            <CheckBox x:Name="_autoCloseCalendar" Grid.Row="3" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>    
+
+            <TextBlock Text="TimeFormat:" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
+            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumTimeFormatData}}" Width="190" Margin="5"/>
+            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" />
+            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190" Margin="5"/>            
+            <TextBlock Text="TimeWatermark:" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"/>
+            <TextBox x:Name="_timeWatermark" Grid.Row="2" Grid.Column="3" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5"/>
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
+            <TextBlock Text="DateTimePicker Usage: " Margin="0,10,0,0" Style="{StaticResource Header}" />
+            <xctk:DateTimePicker x:Name="_datetimePicker"
+                                 Width="300"
+                                 VerticalAlignment="Top"
+                                 IsReadOnly="False"
+                                 Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
+                                 FormatString="{Binding Text, ElementName=_formatString}"
+                                 Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
+                                 TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                                 TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
+                                 TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"
+                                 AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}"/>
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch">
+            <GroupBox Header="TimePicker Features" Margin="0,15,0,0">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Text="StartTime:" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_startTime" Grid.Column="1" Format="ShortTime" Value="9:00" Width="100" Margin="5"/>
+                    <TextBlock Text="EndTime:" Grid.Row="1" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_endTime" Grid.Row="1" Grid.Column="1" Format="ShortTime" Value="17:00" Width="100" Margin="5"/>
+                    <TextBlock Text="TimeInterval:" Grid.Row="2" VerticalAlignment="Center" />
+                    <xctk:DateTimeUpDown x:Name="_timeInterval" Grid.Row="2" Grid.Column="1" Format="Custom" FormatString="H:mm" Value="0:30" Width="100" Margin="5"/>
+                </Grid>
+            </GroupBox>
+
+            <StackPanel>
+                <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
+                <xctk:TimePicker x:Name="_timePicker"
+                                 VerticalAlignment="Top"
+                                 Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                                 FormatString="{Binding Text, ElementName=_timeFormatString}"
+                                 Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
+                                 StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                                 EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                                 TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"/>
+         </StackPanel>
+        </StackPanel>
+    </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
new file mode 100644
index 000000000..c61a8ca98
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views
+{
+  /// <summary>
+  /// Interaction logic for DateTimeView.xaml
+  /// </summary>
+  public partial class DateTimeView : DemoView
+  {
+    public DateTimeView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
new file mode 100644
index 000000000..ebad668b8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Converters/BoxArtImageSourceConverter.cs
@@ -0,0 +1,34 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters
+{
+
+
+
+
+
+
+
+
+
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/OpenSourceImages/ListBox.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/OpenSourceImages/ListBox.png
new file mode 100644
index 000000000..047dc2690
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/OpenSourceImages/ListBox.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Resources/Netflix_icon.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Resources/Netflix_icon.png
new file mode 100644
index 000000000..0bc06f22f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Resources/Netflix_icon.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
new file mode 100644
index 000000000..99db86663
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml
@@ -0,0 +1,47 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views.ListBoxView" 
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" 
+                xmlns:xclb="http://schemas.xceed.com/wpf/xaml/listbox"
+                xmlns:xclt="http://schemas.xceed.com/wpf/xaml/listbox/themes"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib" 
+                VerticalScrollBarVisibility="Disabled"
+                Title="Data Sources">
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+         <Run>Local Data Sources of Any Kind</Run>
+         <LineBreak />
+         <LineBreak />
+         <Run>The listbox supports any local source implementing IEnumerable, and generics too! Factor in its full support of remote data sources, and you have a listbox compatible with all data-binding scenarios.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>The listBox items can be animated, dragged-and-dropped, filtered, grouped, selected in various ways, and sorted. Plus, all of the ListBox components can be styled or themed. In addition, different ways of presenting the listBox items are available, such as horizontal or vertical scrolling and following specific or circle paths.</Run>
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Extended WPF Toolkit Plus.
+            </Hyperlink>
+      </Paragraph>
+   </local:DemoView.Description>
+
+
+
+    <Image Source="..\OpenSourceImages\ListBox.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
new file mode 100644
index 000000000..242b0cb8f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ListBox/Views/ListBoxView.xaml.cs
@@ -0,0 +1,40 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Resources;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views
+{
+  /// <summary>
+  /// Interaction logic for ListBoxView.xaml
+  /// </summary>
+  public partial class ListBoxView : DemoView
+  {
+    #region Initialization
+
+    public ListBoxView()
+    {
+
+      InitializeComponent();
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
new file mode 100644
index 000000000..a52e0c09d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/ColorConverter.cs
@@ -0,0 +1,45 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters
+{
+  class ColorConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( ( value != null ) && value is System.Windows.Media.Color )
+        return new SolidColorBrush( ( System.Windows.Media.Color )value );
+
+      return value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
new file mode 100644
index 000000000..5ba810c39
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Converters/VisibilityConverter.cs
@@ -0,0 +1,73 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters
+{
+  class VisibilityConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value is FrameType )
+      {
+        FrameType frameType = (FrameType)value;
+        int param = int.Parse((string)parameter);
+        switch( frameType )
+        {
+          case FrameType.Circle:
+            {
+              //For the radius
+              if( param == 0 )
+                return Visibility.Visible;
+              //For the rectangle
+              else if( param == 1 )
+                return Visibility.Collapsed;
+            }
+            break;
+          case FrameType.Rectangle:
+            {
+              //For the radius
+              if( param == 0 )
+                return Visibility.Collapsed;
+              //For the rectangle
+              else if( param == 1 )
+                return Visibility.Visible;
+            }
+            break;
+        }
+      }
+
+      return value;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Resources/SampleText.rtf b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Resources/SampleText.rtf
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Magnifier/Resources/SampleText.rtf
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Resources/SampleText.rtf
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
new file mode 100644
index 000000000..565999652
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml
@@ -0,0 +1,99 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views.MagnifierView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters"
+                 Title="Magnifier">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The Magnifier control allows the user to magnify parts of an application.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+        <conv:ColorConverter x:Key="colorConverter" />
+        <conv:VisibilityConverter x:Key="visibilityConverter" />
+        <xctk:RtfFormatter x:Key="rtfFormatter" />
+
+        <ObjectDataProvider x:Key="enumData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="xctk:FrameType"/>
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+    </local:DemoView.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Features" Grid.Row="0" Margin="5">
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="Zoom Factor:" VerticalAlignment="Center" Margin="5" />
+                <xctk:DoubleUpDown x:Name="_zoomFactor" Grid.Column="1" Value="0.4" Minimum="0" Increment="0.1" Maximum="3" FormatString="N1" Width="150" Margin="5" />
+                <TextBlock Text="Border Thickness:" Grid.Row="1" VerticalAlignment="Center" Margin="5" />
+                <xctk:IntegerUpDown x:Name="_borderThickness" Grid.Row="1" Grid.Column="1" Value="2" Minimum="0" Maximum="20" Width="150" Margin="5" />
+                <TextBlock Text="Border Brush:" Grid.Row="2" VerticalAlignment="Center" Margin="5"/>
+                <xctk:ColorPicker x:Name="_colorPicker" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" SelectedColor="#FFEFAC27"/>
+                <TextBlock Grid.Column="2" Text="Frame Type:" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                <ComboBox x:Name="_frameType" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumData}}" Grid.Column="3" Width="150" Margin="5" />
+                <TextBlock Text="Radius:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                <xctk:DoubleUpDown x:Name="_radius" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=0}" Grid.Row="1" Grid.Column="3" Value="80"  Minimum="0" Maximum="150" Width="150" Margin="5"  />
+                <TextBlock Text="RectangleWidth:" Grid.Row="1" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                <xctk:DoubleUpDown x:Name="_width" Grid.Row="1" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
+                <TextBlock Text="RectangleHeight:" Grid.Row="2" Grid.Column="2" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                <xctk:DoubleUpDown  x:Name="_height" Grid.Row="2" Grid.Column="3" Value="160"  Minimum="0" Maximum="300" Visibility="{Binding ElementName=_frameType, Path=SelectedItem, Converter={StaticResource visibilityConverter}, ConverterParameter=1}" Width="150" Margin="5"  />
+            </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="1" Margin="10" HorizontalAlignment="Left" >
+            <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
+            <xctk:RichTextBox x:Name="_txtContent"
+                              IsReadOnly="True" 
+                              TextFormatter="{StaticResource rtfFormatter}" 
+                              FontSize="10" >
+                    <xctk:MagnifierManager.Magnifier>
+                        <xctk:Magnifier x:Name="_magnifier"
+                                        Background="White"
+                                        Radius="{Binding Source={x:Reference _radius}, Path=Value}"
+                                        ZoomFactor="{Binding Source={x:Reference _zoomFactor}, Path=Value}"
+                                        FrameType="{Binding Source={x:Reference _frameType}, Path=SelectedItem}"
+                                        BorderBrush="{Binding Source={x:Reference _colorPicker}, Path=SelectedColor, Converter={StaticResource colorConverter}}"
+                                        BorderThickness="{Binding Source={x:Reference _borderThickness}, Path=Value}"
+                                        Width="{Binding Source={x:Reference _width}, Path=Value, Mode=TwoWay}"
+                                        Height="{Binding Source={x:Reference _height}, Path=Value, Mode=TwoWay}" />
+                    </xctk:MagnifierManager.Magnifier>
+            </xctk:RichTextBox>
+        </StackPanel>
+    </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
new file mode 100644
index 000000000..57e94e0c5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Magnifier/Views/MagnifierView.xaml.cs
@@ -0,0 +1,43 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Resources;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views
+{
+  /// <summary>
+  /// Interaction logic for MagnifierView.xaml
+  /// </summary>
+  public partial class MagnifierView : DemoView
+  {
+    public MagnifierView()
+    {
+      InitializeComponent();
+
+      // Load and display the RTF file.
+      Uri uri = new Uri( "pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/Magnifier/Resources/SampleText.rtf" );
+      StreamResourceInfo info = Application.GetResourceStream( uri );
+      using( StreamReader txtReader = new StreamReader( info.Stream ) )
+      {
+        _txtContent.Text = txtReader.ReadToEnd();
+      }
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
new file mode 100644
index 000000000..f3b800aee
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml
@@ -0,0 +1,212 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views.NumericView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:numeric="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="Numeric"
+                 x:Name="_demo">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Numeric up-down controls provide a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>The following controls are available to support various native numeric types:</Run>
+            <LineBreak />
+            <Run>ByteUpDown, ShortUpDown, IntegerUpDown, LongUpDown, SingleUpDown, DoubleUpDown, DecimalUpDown, CalculatorUpDown.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>All these numeric types support the following properties.</Run>
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+        <x:Array x:Key="FormatStringComboBox" Type="numeric:FormatObject">
+            <numeric:FormatObject Value="C2" DisplayValue="Currency" />
+            <numeric:FormatObject Value="F2" DisplayValue="Fixed Point" />
+            <numeric:FormatObject Value="G" DisplayValue="General" />
+            <numeric:FormatObject Value="N" DisplayValue="Number" />
+            <numeric:FormatObject Value="P2" DisplayValue="Percent" />
+        </x:Array>
+
+        <DataTemplate x:Key="FormatStringItemTemplate">
+            <TextBlock Text="{Binding DisplayValue}" />
+        </DataTemplate>
+
+        <ObjectDataProvider x:Key="AllowInputSpecialValuesComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="xctk:AllowedSpecialValues" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+
+        <ObjectDataProvider x:Key="ParsingNumberStyleComboBox" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+            <ObjectDataProvider.MethodParameters>
+                <x:Type TypeName="sys:Globalization.NumberStyles" />
+            </ObjectDataProvider.MethodParameters>
+        </ObjectDataProvider>
+
+        <Style x:Key="ControlInError" TargetType="Control">
+            <Style.Triggers>
+                <Trigger Property="Validation.HasError" Value="true">
+                    <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
+                            Path=(Validation.Errors).CurrentItem.ErrorContent}" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+
+        <sys:String x:Key="allowInputSpecialValuesTooltip">Infinity and -Infinity input will not be accepted if Maximum and/or Minimum values does not allow them.</sys:String>
+        <sys:String x:Key="parsingNumberStyleTooltip">HexNumber is not a valid choice when used with a DoubleUpDown (current control used in this sample). It will work with the following controls: IntegerUpDown, ByteUpDown, LongUpDown, and ShortUpDown.</sys:String>
+
+    </local:DemoView.Resources>
+
+   <StackPanel>
+      <Grid>
+           <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="*" />
+           </Grid.RowDefinitions>
+
+           <GroupBox Header="Numeric Features" Grid.Row="0" Margin="5">
+               <Grid Margin="5" HorizontalAlignment="Left">
+                   <Grid.RowDefinitions>
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                       <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+                   <Grid.ColumnDefinitions>
+                       <ColumnDefinition Width="Auto" />
+                       <ColumnDefinition Width="95" />
+                       <ColumnDefinition Width="Auto" />
+                       <ColumnDefinition Width="70" />
+                       <ColumnDefinition Width="Auto" />
+                       <ColumnDefinition Width="125" />
+                   </Grid.ColumnDefinitions>
+
+                   <!-- 1st column -->
+                   <TextBlock Text="Mouse Wheel:" Grid.Row="0" VerticalAlignment="Center" />
+                   <ComboBox Grid.Row="0" Grid.Column="1" SelectedItem="{Binding MouseWheelActiveTrigger, ElementName=_doubleUpDown}" Margin="5" VerticalAlignment="Center" >
+                      <x:StaticExtension Member="xctk:MouseWheelActiveTrigger.Focused" />
+                      <x:StaticExtension Member="xctk:MouseWheelActiveTrigger.MouseOver" />
+                      <x:StaticExtension Member="xctk:MouseWheelActiveTrigger.Disabled" />
+                   </ComboBox>
+
+                   <TextBlock Text="Show Button Spinner:" Grid.Row="1" VerticalAlignment="Center" />
+                   <CheckBox Grid.Row="1" Grid.Column="1" IsChecked="{Binding ShowButtonSpinner, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
+
+                   <TextBlock Text="Allow Spin:" Grid.Row="2" VerticalAlignment="Center" />
+                   <CheckBox Grid.Row="2" Grid.Column="1" IsChecked="{Binding AllowSpin, ElementName=_doubleUpDown}" ClickMode="Press" Margin="5" VerticalAlignment="Center" />
+
+                   <TextBlock Text="Clip Value to Min Max:" Grid.Row="3"  VerticalAlignment="Center" />
+                   <CheckBox Grid.Row="3" Grid.Column="1" IsChecked="{Binding ClipValueToMinMax, ElementName=_doubleUpDown, Mode=TwoWay}" ClickMode="Press" Margin="5" VerticalAlignment="Center"/>
+
+                   <TextBlock Text="Is Read Only:" Grid.Row="4" VerticalAlignment="Center" />
+                   <CheckBox Grid.Row="4" Grid.Column="1" IsChecked="{Binding IsReadOnly, ElementName=_doubleUpDown}"  ClickMode="Press" Margin="5" VerticalAlignment="Center" />
+
+                    <!-- 2nd column -->
+                   <TextBlock Grid.Column="2" Text="CultureInfo:" VerticalAlignment="Center" Margin="10,0,0,0" />
+                   <ComboBox Grid.Column="3" ItemsSource="{Binding Cultures, ElementName=_demo}" SelectedValue="{Binding CultureInfo, ElementName=_doubleUpDown}" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Grid.Column="2" Grid.Row="1" Text="FormatString:" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <ComboBox Grid.Column="3" Grid.Row="1" ItemsSource="{Binding Source={StaticResource FormatStringComboBox}}" Text="{Binding FormatString, ElementName=_doubleUpDown, ValidatesOnExceptions=True}" ItemTemplate="{StaticResource FormatStringItemTemplate}" Style="{StaticResource ControlInError}" IsEditable="True" TextSearch.TextPath="Value" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Grid.Column="2" Grid.Row="2" Text="Increment" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="2" Minimum="0" Value="{Binding Increment, ElementName=_doubleUpDown}" AllowInputSpecialValues="None" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Grid.Column="2" Grid.Row="3" Text="Minimum" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="3" Value="{Binding Minimum, ElementName=_doubleUpDown}" AllowInputSpecialValues="NegativeInfinity" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Grid.Column="2" Grid.Row="4" Text="Maximum" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <xctk:DoubleUpDown Grid.Column="3" Grid.Row="4" Value="{Binding Maximum, ElementName=_doubleUpDown}" AllowInputSpecialValues="PositiveInfinity" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <!-- 3rd column -->
+                   <TextBlock Grid.Column="4" Text="ParsingNumberStyle:" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <ComboBox Grid.Column="5" ItemsSource="{Binding Source={StaticResource ParsingNumberStyleComboBox}}" SelectedValue="{Binding ParsingNumberStyle, ElementName=_doubleUpDown}" ToolTip="{StaticResource parsingNumberStyleTooltip}" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Text="Watermark:" Grid.Column="4" Grid.Row="1" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <TextBox Grid.Column="5" Grid.Row="1" HorizontalAlignment="Stretch" Margin="5" Text="{Binding Watermark, ElementName=_doubleUpDown}" />
+
+                   <TextBlock Text="Default Value:" Grid.Column="4" Grid.Row="2" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <xctk:DoubleUpDown Grid.Column="5" Grid.Row="2" Value="{Binding DefaultValue, ElementName=_doubleUpDown}" AllowInputSpecialValues="Any" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Text="Value:" Grid.Column="4" Grid.Row="3" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <xctk:DoubleUpDown Grid.Column="5" Grid.Row="3" Value="{Binding Value, ElementName=_doubleUpDown, ValidatesOnExceptions=True}" AllowInputSpecialValues="Any" Style="{StaticResource ControlInError}" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <TextBlock Text="Text:" Grid.Column="4" Grid.Row="4" VerticalAlignment="Center" Margin="10,0,0,0"/>
+                   <TextBox Grid.Column="5" Grid.Row="4" Text="{Binding Text, ElementName=_doubleUpDown}" VerticalAlignment="Center" HorizontalAlignment="Stretch" Margin="5" />
+
+                   <!-- last rows -->
+                   <TextBlock Text="(DoubleUpDown and SingleUpDown support the AllowInputSpecialValues property)" Grid.Row="5" Grid.ColumnSpan="6" VerticalAlignment="Center" Margin="0,10,0,0"/>
+                   <TextBlock Text="Allow Input Special Values:" VerticalAlignment="Center" Grid.Row="6" Grid.ColumnSpan="2"/>
+                   <ComboBox Grid.Column="2" Grid.Row="6" Grid.ColumnSpan="2" ItemsSource="{Binding Source={StaticResource AllowInputSpecialValuesComboBox}}" SelectedValue="{Binding AllowInputSpecialValues, ElementName=_doubleUpDown}" ToolTip="{StaticResource allowInputSpecialValuesTooltip}" Margin="5" Width="108"/>
+                </Grid>
+           </GroupBox>
+
+           <StackPanel Grid.Row="1" Margin="10" Orientation="Horizontal" HorizontalAlignment="Left">
+               <TextBlock Text="DoubleUpDown Usage:" Style="{StaticResource Header}" />
+               <xctk:DoubleUpDown x:Name="_doubleUpDown"
+                                  Margin="10" Width="250" 
+                                  AllowInputSpecialValues="Any"
+                                  ClipValueToMinMax="False"
+                                  ShowButtonSpinner="True" 
+                                  AllowSpin="True"
+                                  IsReadOnly="False" 
+                                  MouseWheelActiveOnFocus="True"
+                                  CultureInfo="en-US"
+                                  FormatString="C2"
+                                  Increment="0.5"
+                                  Maximum="100"
+                                  Minimum="0"
+                                  ParsingNumberStyle="Any"
+                                  Watermark="Enter Text"
+                                  DefaultValue="10"
+                                  Value="25" />
+         </StackPanel>
+
+           <TextBlock Grid.Row="2" Margin="10,25,0,0"
+                      Text="CalculatorUpDown is a DecimalUpDown with all the properties from a NumericUpDown. It provides a Calculator dropdown which allows you to perform mathematical calculations."
+                      TextWrapping="Wrap" />
+
+           <GroupBox Header="CalculatorUpDown Features" Grid.Row="3" Margin="5,15,0,0">
+                <StackPanel Orientation="Horizontal" Margin="5" HorizontalAlignment="Left">
+                    <TextBlock Text="Enter closes calculator:" VerticalAlignment="Center" />
+                    <CheckBox x:Name="_enterClosesCalculator" IsChecked="{Binding EnterClosesCalculator, ElementName=_calculatorUpDown}"  VerticalAlignment="Center" Margin="5" />
+                    <TextBlock Text="Precision(decimal places): " Margin="70,0,0,0" VerticalAlignment="Center"/>
+                    <xctk:IntegerUpDown Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="{Binding Precision, ElementName=_calculatorUpDown}" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+                </StackPanel>
+            </GroupBox>
+
+           <StackPanel Grid.Row="4" Orientation="Horizontal" Margin="10" HorizontalAlignment="Left">
+             <TextBlock Text="CalculatorUpDown Usage:" Style="{StaticResource Header}" />
+             <xctk:CalculatorUpDown x:Name="_calculatorUpDown"
+                                    Margin="10" Width="250"
+                                    Precision="2"
+                                    EnterClosesCalculator="False"
+                                    Value="30"/>
+          </StackPanel>
+
+       </Grid>
+   </StackPanel>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
new file mode 100644
index 000000000..c1127a6c9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Numeric/Views/NumericView.xaml.cs
@@ -0,0 +1,62 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Collections.Generic;
+using System.Globalization;
+using System;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views
+{
+  /// <summary>
+  /// Interaction logic for NumericView.xaml
+  /// </summary>
+  public partial class NumericView : DemoView
+  {
+    public NumericView()
+    {
+      this.Cultures = new List<CultureInfo>() { new CultureInfo( "en-US" ),
+                                                new CultureInfo("en-GB"),
+                                                new CultureInfo("fr-FR"),
+                                                new CultureInfo("ar-DZ"),
+                                                new CultureInfo("zh-CN"),
+                                                new CultureInfo("cs-CZ") };
+
+      InitializeComponent();
+    }
+
+    public List<CultureInfo> Cultures
+    {
+      get;
+      private set;
+    }
+  }
+
+
+  public class FormatObject
+  {
+    public string Value
+    {
+      get;
+      set;
+    }
+
+    public string DisplayValue
+    {
+      get;
+      set;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
new file mode 100644
index 000000000..60cb8a30a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Converters/ComboBoxToVisibilityConverter.cs
@@ -0,0 +1,44 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters
+{
+  class ComboBoxToVisibilityConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( ( value is int ) && ( parameter is string )
+        && ( int )value == Int32.Parse( ( string )parameter ) )
+      {
+        return Visibility.Visible;
+      }
+
+      return Visibility.Collapsed;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AnimatedTimelinePanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AnimatedTimelinePanel.png
new file mode 100644
index 000000000..ee975861b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AnimatedTimelinePanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AutoStretchStackPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AutoStretchStackPanel.png
new file mode 100644
index 000000000..e9e86b1c5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/AutoStretchStackPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/CameraPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/CameraPanel.png
new file mode 100644
index 000000000..5741c665f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/CameraPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Canvas.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Canvas.png
new file mode 100644
index 000000000..5eb6a4329
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Canvas.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Carousel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Carousel.png
new file mode 100644
index 000000000..9e9e042b5
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Carousel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/DockPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/DockPanel.png
new file mode 100644
index 000000000..7a909a9d6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/DockPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Grid.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Grid.png
new file mode 100644
index 000000000..e893d171a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/Grid.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/PerspectivePanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/PerspectivePanel.png
new file mode 100644
index 000000000..3a90355eb
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/PerspectivePanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RadialCanvas.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RadialCanvas.png
new file mode 100644
index 000000000..0cc254051
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RadialCanvas.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RelativeCanvas.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RelativeCanvas.png
new file mode 100644
index 000000000..76771ab3e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/RelativeCanvas.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackPanel.png
new file mode 100644
index 000000000..58c3ee213
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackedStackPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackedStackPanel.png
new file mode 100644
index 000000000..077c49bd7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/OpenSourceImages/StackedStackPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
similarity index 78%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
index edb081ef7..5d7dede81 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Panels/Views/SwitchPanelView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml
@@ -1,36 +1,37 @@
-﻿<!--*********************************************************************
+﻿<!--*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
-   This program can be provided to you by Xceed Software Inc. under a
-   proprietary commercial license agreement for use in non-Open Source
-   projects. The commercial version of Extended WPF Toolkit also includes
-   priority technical support, commercial updates, and many additional 
-   useful WPF controls if you license Xceed Business Suite for WPF.
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter.
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  ********************************************************************-->
-<sample:DemoView x:Class="Samples.Modules.Panels.Views.SwitchPanelView"
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views.SwitchPanelView"
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:sample="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-                 xmlns:local="clr-namespace:Samples.Modules.Panels.Views"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
                  xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                  xmlns:panels="clr-namespace:Xceed.Wpf.Toolkit.Panels;assembly=Xceed.Wpf.Toolkit"
-                 xmlns:conv="clr-namespace:Samples.Modules.Panels.Converters"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters"
                  xmlns:s="clr-namespace:System;assembly=mscorlib"
                  VerticalScrollBarVisibility="Disabled"
-                 Title="Switch Panel"
-                 Description="The SwitchPanel allows you to animate the children between different layouts.">
-   <sample:DemoView.Resources>
+                 Title="SwitchPanel">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The SwitchPanel allows you to animate the children between different layouts.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
       <Style x:Key="panelElement" TargetType="{x:Type TextBlock}">
-         <Setter Property="Background" Value="Blue" />
+         <Setter Property="Background" Value="#FFEFAC27" />
          <Setter Property="Foreground" Value="White" />
          <Setter Property="Margin" Value="5" />
          <Setter Property="Width" Value="100" />
@@ -45,13 +46,27 @@
       </ObjectDataProvider>
 
       <Style x:Key="controlInError" TargetType="Control">
-            <Style.Triggers>
-                <Trigger Property="Validation.HasError" Value="true">
-                    <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
-                            Path=(Validation.Errors).CurrentItem.ErrorContent}" />
-                </Trigger>
-            </Style.Triggers>
-        </Style>
+        <Style.Triggers>
+            <Trigger Property="Validation.HasError" Value="true">
+                <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self},
+                        Path=(Validation.Errors).CurrentItem.ErrorContent}" />
+            </Trigger>
+        </Style.Triggers>
+     </Style>
+
+      <Style x:Key="plusSuffix" TargetType="TextBlock">
+          <Setter Property="Margin" Value="5,0,0,0"/>
+          <Setter Property="Text" Value="Plus Only"/>
+          <Setter Property="FontStyle" Value="Italic"/>
+          <Setter Property="FontSize" Value="8"/>
+          <Setter Property="BaselineOffset" Value="7"/>
+          <Setter Property="Foreground" Value="#06b025"/>
+          <Style.Triggers>
+            <DataTrigger Binding="{Binding IsHighlighted, RelativeSource={RelativeSource AncestorType={x:Type ComboBoxItem}}}" Value="True">
+                <Setter Property="Foreground" Value="White"/>
+            </DataTrigger>
+          </Style.Triggers>
+      </Style>
 
       <Style x:Key="plusItem" TargetType="ComboBoxItem" >
          <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
@@ -60,7 +75,7 @@
                <DataTemplate>
                   <DockPanel>
                      <TextBlock DockPanel.Dock="Left" Text="{Binding}" />
-                     <TextBlock TextAlignment="Right" Foreground="OrangeRed" Style="{StaticResource plusSuffix}" />
+                     <TextBlock TextAlignment="Right" Style="{StaticResource plusSuffix}" />
                   </DockPanel>
                </DataTemplate>
             </Setter.Value>
@@ -95,7 +110,7 @@
 
 
 
-   </sample:DemoView.Resources>
+   </local:DemoView.Resources>
 
    <Grid>
       <Grid.RowDefinitions>
@@ -131,14 +146,17 @@
 
       <Grid Grid.Row="1" Margin="10">
          <Grid.RowDefinitions >
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
             <RowDefinition Height="Auto" />
             <RowDefinition Height="Auto" />
          </Grid.RowDefinitions>
+
          <TextBlock Grid.Row="0" Text="Usage:" Style="{StaticResource Header}" />
+        <TextBlock Grid.Row="1" Text="Resize the window to see the layout animation." />
 
-        <xctk:SwitchPanel x:Name="_switchPanel" Grid.Row="1" ActiveLayoutIndex="{Binding ElementName=layoutCombo, Path=SelectedIndex}" ActiveLayoutChanged="OnSwitchPanelLayoutChanged">
+        <xctk:SwitchPanel x:Name="_switchPanel" Grid.Row="2" ActiveLayoutIndex="{Binding ElementName=layoutCombo, Path=SelectedIndex}" ActiveLayoutChanged="OnSwitchPanelLayoutChanged">
             <xctk:SwitchPanel.Layouts>
                <xctk:WrapPanel x:Name="_wrapPanel" ItemWidth="100" ItemHeight="100"/>
                <xctk:RandomPanel x:Name="_randomPanel" />
@@ -153,17 +171,20 @@
             <TextBlock x:Name="_item8" Text="Item #8" Style="{StaticResource panelElement}"/>
          </xctk:SwitchPanel>
 
-         <Image x:Name="_openSourceScreenShot" Grid.Row="1" Height="250" Visibility="Collapsed" />
-         <TextBlock x:Name="_openSourceScreenShotDesc" Grid.Row="2" TextWrapping="Wrap" Visibility="Collapsed" />
-         <TextBlock x:Name="_openSourceHyperlink" Grid.Row="3" Visibility="Collapsed">
-            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
-               Click here for more details about Extended WPF Toolkit Plus.
-            </Hyperlink>
-          </TextBlock>
+         <Image x:Name="_openSourceScreenShot" Grid.Row="2" Height="250" Visibility="Collapsed" />
+         <TextBlock x:Name="_openSourceScreenShotDesc" Grid.Row="3" TextWrapping="Wrap" Visibility="Collapsed" />
+         <StackPanel x:Name="_openSourceTextHyperlink" Grid.Row="4" Orientation="Horizontal" Visibility="Collapsed">
+             <TextBlock Text="This Panel is only available in the &quot;Plus&quot; version. "/>
+             <TextBlock>
+                 <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+                    Click here for more details about Xceed Extended WPF Toolkit Plus.
+                 </Hyperlink>
+             </TextBlock>
+         </StackPanel>
 
          <GroupBox Header="WrapPanel Toolbox" 
                    Background="White"
-                   Grid.Row="2" 
+                   Grid.Row="3" 
                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=0}" 
                    Margin="10" >
             <StackPanel>
@@ -228,7 +249,7 @@
 
          <GroupBox Header="RandomPanel Toolbox" 
                    Background="White"
-                   Grid.Row="2" 
+                   Grid.Row="3" 
                    Visibility="{Binding SelectedIndex, ElementName=layoutCombo, Converter={StaticResource comboBoxToVisibilityConverter}, ConverterParameter=1}" 
                    Margin="10" >
             <StackPanel>
@@ -252,22 +273,24 @@
                     </Grid.RowDefinitions>
 
                     <TextBlock Text="Minimum Width:" VerticalAlignment="Center"/>
-                    <xctk:DoubleUpDown Grid.Column="1"
+                    <xctk:DoubleUpDown x:Name="_minimumWidth"
+                                       Grid.Column="1"
                                        Value="{Binding MinimumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
                                        AllowInputSpecialValues="None"
                                        Minimum="0"
-                                       Maximum="100"
+                                       Maximum="{Binding Value, ElementName=_maximumWidth}"
                                        Width="100"
                                        Height="20"
                                        Style="{StaticResource controlInError}"
                                        VerticalAlignment="Center"
                                        Margin="5" />
                     <TextBlock Grid.Row="1" Text="Maximum Width:" VerticalAlignment="Center"/>
-                    <xctk:DoubleUpDown Grid.Column="1"
+                    <xctk:DoubleUpDown x:Name="_maximumWidth"
+                                       Grid.Column="1"
                                        Grid.Row="1"
                                        Value="{Binding MaximumWidth, ElementName=_randomPanel, ValidatesOnExceptions=True}"
                                        AllowInputSpecialValues="None"
-                                       Minimum="0"
+                                       Minimum="{Binding Value, ElementName=_minimumWidth}"
                                        Maximum="100"
                                        Width="100"
                                        Height="20"
@@ -275,22 +298,24 @@
                                        VerticalAlignment="Center"
                                        Margin="5" />
                     <TextBlock Grid.Column="2" Text="Minimum Height:" VerticalAlignment="Center" Margin="10,0,0,0"/>
-                    <xctk:DoubleUpDown Grid.Column="3" 
+                    <xctk:DoubleUpDown x:Name="_minimumHeight"
+                                       Grid.Column="3" 
                                        Value="{Binding MinimumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}"
                                        AllowInputSpecialValues="None"
                                        Minimum="0"
-                                       Maximum="100"
+                                       Maximum="{Binding Value, ElementName=_maximumHeight}"
                                        Width="100"
                                        Height="20"
                                        Style="{StaticResource controlInError}"
                                        VerticalAlignment="Center"
                                        Margin="5"/>
                     <TextBlock Grid.Column="2" Grid.Row="1" Text="Maximum Height:" VerticalAlignment="Center" Margin="10,0,0,0" />
-                    <xctk:DoubleUpDown Grid.Column="3" 
+                    <xctk:DoubleUpDown x:Name="_maximumHeight"
+                                       Grid.Column="3" 
                                        Grid.Row="1"
                                        Value="{Binding MaximumHeight, ElementName=_randomPanel, ValidatesOnExceptions=True}" 
                                        AllowInputSpecialValues="None"
-                                       Minimum="0"
+                                       Minimum="{Binding Value, ElementName=_minimumHeight}"
                                        Maximum="100"
                                        Width="100"
                                        Height="20"
@@ -338,4 +363,4 @@
 
      </Grid>
    </Grid>
-</sample:DemoView>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
new file mode 100644
index 000000000..ce3802818
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Panels/Views/SwitchPanelView.xaml.cs
@@ -0,0 +1,194 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System;
+using System.Windows;
+using Xceed.Wpf.Toolkit.Panels;
+using System.Collections.Generic;
+using Xceed.Wpf.Toolkit;
+using System.Text.RegularExpressions;
+using System.IO;
+using System.Diagnostics;
+using System.Windows.Media.Imaging;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
+{
+  /// <summary>
+  /// Interaction logic for SwitchPanelView.xaml
+  /// </summary>
+  public partial class SwitchPanelView : DemoView
+  {
+    #region Members
+
+
+    #endregion
+
+    public SwitchPanelView()
+    {
+      InitializeComponent();
+    }
+
+    #region Event Handlers
+
+    private void OnLayoutComboSelectionChanged( object sender, RoutedEventArgs e )
+    {
+      ComboBox comboBox = sender as ComboBox;
+      bool isPlusPanel = (comboBox.SelectedIndex >= 2);
+
+      if( _openSourceScreenShot != null )
+        _openSourceScreenShot.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
+      if( _openSourceScreenShotDesc != null )
+        _openSourceScreenShotDesc.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
+      if( _openSourceTextHyperlink != null )
+        _openSourceTextHyperlink.Visibility = isPlusPanel ? Visibility.Visible : Visibility.Collapsed;
+      if( _switchPanel != null )
+        _switchPanel.Visibility = isPlusPanel ? Visibility.Collapsed : Visibility.Visible;
+
+      if( isPlusPanel )
+      {
+        BitmapImage bitmapImage = new BitmapImage();
+        string desc;
+
+        bitmapImage.BeginInit();
+        switch( comboBox.SelectedIndex )
+        {
+          case 2: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Canvas.png", UriKind.Relative );
+            desc = this.Resources[ "canvasPanelDescription" ] as string;
+            break;
+          case 3: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Carousel.png", UriKind.Relative );
+            desc = this.Resources[ "carouselDescription" ] as string;
+            break;
+          case 4: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\DockPanel.png", UriKind.Relative );
+            desc = this.Resources[ "dockPanelDescription" ] as string;
+            break;
+          case 5: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\Grid.png", UriKind.Relative );
+            desc = this.Resources[ "gridDescription" ] as string;
+            break;
+          case 6: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\StackPanel.png", UriKind.Relative );
+            desc = this.Resources[ "stackPanelDescription" ] as string;
+            break;
+          case 7: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\StackedStackPanel.png", UriKind.Relative );
+            desc = this.Resources[ "stackedStackPanelDescription" ] as string;
+            break;
+          case 8: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AutoStretchStackPanel.png", UriKind.Relative );
+            desc = this.Resources[ "autoStretchStackPanelDescription" ] as string;
+              break;
+          case 9: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\RelativeCanvas.png", UriKind.Relative );
+            desc = this.Resources[ "relativeCanvasDescription" ] as string;
+              break;
+          case 10: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\RadialCanvas.png", UriKind.Relative );
+            desc = this.Resources[ "radialCanvasDescription" ] as string;
+            break;
+          case 11: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\CameraPanel.png", UriKind.Relative );
+            desc = this.Resources[ "cameraPanelDescription" ] as string;
+            break;
+          case 12: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\PerspectivePanel.png", UriKind.Relative );
+            desc = this.Resources[ "perspectivePanelDescription" ] as string;
+            break;
+          case 13: 
+            bitmapImage.UriSource = new Uri( "..\\OpenSourceImages\\AnimatedTimelinePanel.png", UriKind.Relative );
+            desc = this.Resources[ "animatedTimelinePanelDescription" ] as string;
+            break;
+          default: throw new InvalidDataException( "LayoutcomboBox.SelectedIndex is not valid." );
+        }
+        bitmapImage.EndInit();
+
+        if( _openSourceScreenShot != null )
+          _openSourceScreenShot.Source = bitmapImage;
+        if( _openSourceScreenShotDesc != null )
+          _openSourceScreenShotDesc.Text = desc;
+      }
+    }
+
+    private void OnSwitchPanelLayoutChanged( object sender, RoutedEventArgs e )
+    {
+    }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    #endregion 
+
+    #region Methods (Private)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    #endregion
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
new file mode 100644
index 000000000..aa9b0d5e5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Converters/SliceLabelConverter.cs
@@ -0,0 +1,36 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters
+{
+  public class SliceLabelConverter : IValueConverter
+  {
+    public object Convert( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( ( double )value ).ToString( "#.#% " + parameter );
+    }
+
+    public object ConvertBack( object value, System.Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new System.NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
new file mode 100644
index 000000000..c625be93e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml
@@ -0,0 +1,240 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieChartView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Pie Chart">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            Obviously, the Pie control can be used to create a pie chart.
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+   <local:DemoView.Resources>
+      <XmlDataProvider x:Key="XMLData">
+         <x:XData>
+            <Milks xmlns="">
+               <Milk Type="Human"
+                     Fat=".040"
+                     Protein=".011"
+                     Lactose=".068"
+                     Water=".88" />
+               <Milk Type="Cow"
+                     Fat=".037"
+                     Protein=".034"
+                     Lactose=".048"
+                     Water=".87" />
+               <Milk Type="Cow Holstein Friesian"
+                     Fat=".036"
+                     Protein=".034"
+                     Lactose=".049"
+                     Water=".87" />
+               <Milk Type="Cow Brown Swiss"
+                     Fat=".040"
+                     Protein=".036"
+                     Lactose=".047"
+                     Water=".87" />
+               <Milk Type="Cow Jersey"
+                     Fat=".052"
+                     Protein=".039"
+                     Lactose=".049"
+                     Water=".85" />
+               <Milk Type="Cow Zebu"
+                     Fat=".047"
+                     Protein=".033"
+                     Lactose=".049"
+                     Water=".86" />
+               <Milk Type="Water Buffalo"
+                     Fat=".069"
+                     Protein=".038"
+                     Lactose=".051"
+                     Water=".83" />
+               <Milk Type="Yak"
+                     Fat=".065"
+                     Protein=".058"
+                     Lactose=".046"
+                     Water=".82" />
+               <Milk Type="Goat"
+                     Fat=".040"
+                     Protein=".034"
+                     Lactose=".045"
+                     Water=".88" />
+               <Milk Type="Sheep"
+                     Fat=".075"
+                     Protein=".060"
+                     Lactose=".048"
+                     Water=".80" />
+               <Milk Type="Camel"
+                     Fat=".029"
+                     Protein=".039"
+                     Lactose=".054"
+                     Water=".87" />
+               <Milk Type="Reindeer"
+                     Fat=".017"
+                     Protein=".011"
+                     Lactose=".028"
+                     Water=".68" />
+               <Milk Type="Horse"
+                     Fat=".012"
+                     Protein=".020"
+                     Lactose=".063"
+                     Water=".90" />
+               <Milk Type="Fin Whale"
+                     Fat=".042"
+                     Protein=".012"
+                     Lactose=".013"
+                     Water=".43" />
+            </Milks>
+         </x:XData>
+      </XmlDataProvider>
+
+      <conv:SliceLabelConverter x:Key="sliceLabelConverter" />
+
+      <DataTemplate x:Key="MilkTemplate">
+         <StackPanel Orientation="Horizontal">
+            <TextBlock Width="135"
+                       Text="{Binding XPath=@Type}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Fat}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Protein}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Lactose}" />
+            <TextBlock Width="100"
+                       Text="{Binding XPath=@Water}" />
+         </StackPanel>
+      </DataTemplate>
+   </local:DemoView.Resources>
+   <Grid x:Name="LayoutRoot"
+         DataContext="{Binding Source={StaticResource XMLData}, XPath=/Milks/Milk}"
+         HorizontalAlignment="Center"
+         VerticalAlignment="Center">
+      <Control />
+      <ListBox x:Name="PieDataListBox"
+               VerticalAlignment="Top"
+               Height="150"
+               ItemTemplate="{StaticResource MilkTemplate}"
+               ItemsSource="{Binding}"
+               IsSynchronizedWithCurrentItem="True"
+               HorizontalAlignment="Center"
+               Width="503"
+               ScrollViewer.HorizontalScrollBarVisibility="Disabled" />
+      <Viewbox x:Name="PiesViewbox"
+               HorizontalAlignment="Center"
+               Margin="20,270,20,0"
+               VerticalAlignment="Top"
+               Width="250"
+               Height="250"
+               Stretch="Fill">
+         <Grid Width="192"
+               x:Name="PiesGrid"
+               Height="192">
+
+            <xctk:Pie x:Name="WaterPie"
+                      Fill="#FFCFDCFA"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      Slice="{Binding XPath=@Water}" />
+
+            <xctk:Pie x:Name="LactosePie"
+                      Fill="#FFEBFF68"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=WaterPie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Lactose}" />
+
+            <xctk:Pie x:Name="FatPie"
+                      Fill="#FF6EFA6E"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=LactosePie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Fat}" />
+
+            <xctk:Pie x:Name="ProteinPie"
+                      Fill="#FFFF8676"
+                      Stroke="#FF000000"
+                      Opacity="0.5"
+                      StartAngle="{Binding EndAngle, ElementName=FatPie, Mode=OneWay}"
+                      Slice="{Binding XPath=@Protein}" />
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=WaterPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Water}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=WaterPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=LactosePie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Lactose}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=LactosePie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=FatPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Fat}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=FatPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+            <TextBlock RenderTransformOrigin="0.5,0.5"
+                       VerticalAlignment="Center"
+                       Text="{Binding ElementName=ProteinPie, Path=Slice, Converter={StaticResource sliceLabelConverter}, ConverterParameter=Protein}"
+                       HorizontalAlignment="Left"
+                       Margin="60,0,0,0"
+                       FontFamily="Segoe UI"
+                       FontSize="9">
+					<TextBlock.RenderTransform>
+						<TransformGroup>
+							<TranslateTransform X="135" Y="0" />
+							<RotateTransform Angle="{Binding EndAngle, ElementName=ProteinPie}" />
+						</TransformGroup>
+					</TextBlock.RenderTransform>
+            </TextBlock>
+
+         </Grid>
+      </Viewbox>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
new file mode 100644
index 000000000..1f5ef0758
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieChartView.xaml.cs
@@ -0,0 +1,32 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.LiveExplorer;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for PieChartView.xaml
+  /// </summary>
+  public partial class PieChartView : DemoView
+  {
+    public PieChartView()
+    {
+      InitializeComponent();
+    }
+  } 
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
new file mode 100644
index 000000000..8deec11f9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
@@ -0,0 +1,103 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieProgressView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Pie Progress">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The Pie control properties can be animated to create various effects and controls like this circular progress bar.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <ControlTemplate x:Key="PieProgressTemplate"
+                       TargetType="{x:Type ProgressBar}">
+         <Grid>
+            <xctk:Pie x:Name="Pie"
+                      Fill="#FFEFAC27"
+                      HorizontalAlignment="Stretch"
+                      Width="Auto"
+                      StrokeThickness="4"
+                      Slice="{TemplateBinding Value}"
+                      RenderTransformOrigin="0.5,0.5">
+               <xctk:Pie.RenderTransform>
+                  <RotateTransform Angle="-90" />
+               </xctk:Pie.RenderTransform>
+            </xctk:Pie>
+            <Ellipse Fill="White"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     Width="100"
+                     Height="100" />
+            <StackPanel HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+               <TextBlock  FontSize="24"
+                           FontWeight="Bold"
+                           Foreground="Black"
+                           Text="{Binding ElementName=Pie, Path=Slice, StringFormat=#%}" />
+            </StackPanel>
+         </Grid>
+      </ControlTemplate>
+      <Storyboard x:Key="SimulateProgressStoryboard"
+                  Duration="00:00:04"
+                  AccelerationRatio="0.5"
+                  DecelerationRatio="0.5">
+         <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                                        Storyboard.TargetName="progressBar"
+                                        Storyboard.TargetProperty="(RangeBase.Value)">
+            <SplineDoubleKeyFrame KeyTime="00:00:00"
+                                  Value="0" />
+            <SplineDoubleKeyFrame KeyTime="00:00:04"
+                                  Value="1" />
+         </DoubleAnimationUsingKeyFrames>
+      </Storyboard>
+   </local:DemoView.Resources>
+
+   <local:DemoView.Triggers>
+      <EventTrigger RoutedEvent="ButtonBase.Click"
+                    SourceName="SimulateProgressButton">
+         <BeginStoryboard Storyboard="{StaticResource SimulateProgressStoryboard}" />
+      </EventTrigger>
+   </local:DemoView.Triggers>
+
+   <Grid x:Name="LayoutRoot"
+         HorizontalAlignment="Center"
+         VerticalAlignment="Center">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="0.66*" />
+         <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+      <ProgressBar x:Name="progressBar"
+                   Template="{StaticResource PieProgressTemplate}"
+                   Value="0"
+                   Height="200"
+                   Width="200"
+                   Minimum="0"
+                   Maximum="1" />
+      <Button x:Name="SimulateProgressButton"
+              Content="Simulate Progress"
+              HorizontalAlignment="Center"
+              Margin="0,20,0,0"
+              VerticalAlignment="Center"
+              Width="200"
+              Height="50"
+              Grid.Row="1" />
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
new file mode 100644
index 000000000..86f5e632b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml.cs
@@ -0,0 +1,32 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for PieProgressView.xaml
+  /// </summary>
+  public partial class PieProgressView : DemoView
+  {
+    public PieProgressView()
+    {
+      InitializeComponent();
+    }
+  }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
new file mode 100644
index 000000000..8d5447833
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml
@@ -0,0 +1,229 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views.PieView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Pie"
+                 x:Name="demo">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            The Pie shape is a WPF shape that represents a portion of an ellipse.  It is in the same shape as a slice of pie (hence the name).  More precisely, the Pie shape is represented as either a full ellipse (Slice = 1.0), nothing (Slice = 0.0), or an arc of an ellipse joined to its center by two line segments.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <xctk:ColorToSolidColorBrushConverter x:Key="colorConverter" />
+   </local:DemoView.Resources>
+
+   <Grid HorizontalAlignment="Stretch"
+         VerticalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto"/>
+         <ColumnDefinition Width="*"/>
+      </Grid.ColumnDefinitions>
+
+      <GroupBox Header="Features"
+                 HorizontalAlignment="Left"
+                 VerticalAlignment="Stretch"
+                 Margin="20,0,0,0">
+         <Grid DataContext="{Binding ElementName=pie}"
+            Width="337">
+
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="113" />
+               <ColumnDefinition Width="145" />
+               <ColumnDefinition Width="79" />
+            </Grid.ColumnDefinitions>
+
+            <Grid.RowDefinitions>
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+               <RowDefinition Height="45" />
+            </Grid.RowDefinitions>
+
+            <TextBlock Grid.Row="0"
+                    Grid.Column="0"
+                    Text="Mode"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" 
+                    />
+            <ComboBox  Grid.Row="0"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    Height="26"
+                    Width="Auto"
+                    Margin="10,5,10,5"
+                    SelectedItem="{Binding Mode}"
+                    SelectionChanged="ComboBox_SelectionChanged">
+               <x:StaticExtension Member="xctk:PieMode.Manual" />
+               <x:StaticExtension Member="xctk:PieMode.EndAngle" />
+               <x:StaticExtension Member="xctk:PieMode.Slice" />
+            </ComboBox>
+
+            <TextBlock Grid.Row="1"
+                    Grid.Column="0"
+                    Text="Start Angle"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider    Grid.Row="1"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="360"
+                    Width="Auto"
+                    Value="{Binding StartAngle}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="1"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding StartAngle}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="2"
+                    Grid.Column="0"
+                    Text="End Angle"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider    x:Name="endAngleSlider"
+                    Grid.Row="2"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="360"
+                    Width="Auto"
+                    Value="{Binding EndAngle}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="2"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding EndAngle}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="3"
+                    Grid.Column="0"
+                    Text="Slice"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    HorizontalAlignment="Left"
+                    Margin="20,0,0,0" />
+            <Slider x:Name="sliceSlider"
+                    Grid.Row="3"
+                    Grid.Column="1"
+                    VerticalAlignment="Center"
+                    Minimum="0"
+                    Maximum="1"
+                    Width="Auto"
+                    Value="{Binding Slice}"
+                    Height="Auto"
+                    HorizontalAlignment="Stretch"
+                    Margin="10,5,10,5"
+                    Grid.ColumnSpan="1" />
+            <TextBlock Grid.Row="3"
+                    Grid.Column="2"
+                    Width="50"
+                    Text="{Binding Slice}"
+                    VerticalAlignment="Center"
+                    Height="Auto"
+                    TextTrimming="CharacterEllipsis" />
+
+            <TextBlock Grid.Row="4"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Sweep Direction"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <ComboBox  Grid.Row="4"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    Height="26"
+                    Width="Auto"
+                    Margin="10,5,10,5"
+                    SelectedValue="{Binding SweepDirection}"
+                    SelectedValuePath="Content">
+               <ComboBoxItem Content="{x:Static SweepDirection.Clockwise}" />
+               <ComboBoxItem Content="{x:Static SweepDirection.Counterclockwise}" />
+            </ComboBox>
+
+            <TextBlock Grid.Row="5"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Fill Color"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <xctk:ColorPicker x:Name="FillSelector"
+                    Grid.Row="5"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    SelectedColor="#FFEFAC27"
+                    Height="26"
+                    Margin="10,5,10,5"
+                    Width="Auto" />            
+            <TextBlock Grid.Row="6"
+                    Grid.Column="0"
+                    Margin="20,5,0,5"
+                    Text="Stroke Color"
+                    HorizontalAlignment="Left"
+                    VerticalAlignment="Center" />
+            <xctk:ColorPicker  x:Name="StrokeSelector"
+                    Grid.Row="6"
+                    Grid.Column="1"
+                    Grid.ColumnSpan="1"
+                    HorizontalAlignment="Stretch"
+                    SelectedColor="Black"
+                    Height="26"
+                    Margin="10,5,10,5"
+                    Width="Auto" />            
+         </Grid>
+      </GroupBox>
+      <xctk:Pie x:Name="pie"
+                Grid.Column="1"
+                Height="{Binding ElementName=pie, Path=ActualWidth}"
+                Fill="{Binding ElementName=FillSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
+                Stroke="{Binding ElementName=StrokeSelector, Path=SelectedColor, Mode=OneWay, Converter={StaticResource colorConverter}}"
+                StrokeThickness="2"
+                StartAngle="180"
+                SweepDirection="Clockwise"
+                Margin="20,0,0,0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Center" />
+
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
new file mode 100644
index 000000000..917e8e346
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieView.xaml.cs
@@ -0,0 +1,46 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************/
+
+using System.Windows.Data;
+using System.Windows.Media;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Reflection;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
+{
+  /// <summary>
+  /// Interaction logic for PieView.xaml
+  /// </summary>
+  public partial class PieView : DemoView
+  {
+    public PieView()
+    {
+      InitializeComponent();
+    }
+
+    private void ComboBox_SelectionChanged( object sender, System.Windows.Controls.SelectionChangedEventArgs e )
+    {
+      ComboBox modeCombo = ( ComboBox )sender;
+      PieMode newMode = ( PieMode )modeCombo.SelectedItem;
+      this.endAngleSlider.IsEnabled = ( newMode != PieMode.Slice );
+      this.sliceSlider.IsEnabled = ( newMode != PieMode.EndAngle );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
new file mode 100644
index 000000000..dafeb8cb0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Converters/FullNameStringConverter.cs
@@ -0,0 +1,28 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters
+{
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/OpenSourceImages/PileFlowPanel.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/OpenSourceImages/PileFlowPanel.png
new file mode 100644
index 000000000..6b0551b1d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/OpenSourceImages/PileFlowPanel.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
new file mode 100644
index 000000000..fb67bf448
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml
@@ -0,0 +1,70 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views.PileFlowPanelView" 
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer" 
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" 
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib" 
+                Title="Pile Flow Panel">
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>PileFlowPanel contains PileFlowItem objects ("flow items"). A PileFlowItem is responsible for animating its element and can contain any FrameworkElement-derived class.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>The PileFlowCard class is used for displaying content with an optional mirror-like reflection in the PileFlowPanel beneath the content; this class is used in XAML to add elements to PileFlowPanel.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>
+                The PileFlowPanel class also contains a label that can be configured to display the PileFlowItem data via the property ContentLabel. When the PileFlowPanel has focus, this sample lets the arrow buttons or the mouse wheel modify the selection.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+      </Paragraph>
+   </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\PileFlowPanel.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
new file mode 100644
index 000000000..9ed8cc04f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PileFlowPanel/Views/PileFlowPanelView.xaml.cs
@@ -0,0 +1,67 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Media;
+using System.Windows.Controls;
+using System;
+using System.Diagnostics;
+using System.Windows;
+using Xceed.Wpf.Toolkit;
+using System.IO;
+using System.Windows.Media.Imaging;
+using Xceed.Wpf.Samples.SampleData;
+using System.Collections.ObjectModel;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views
+{
+  /// <summary>
+  /// Interaction logic for PileFlowPanelView.xaml
+  /// </summary>
+  public partial class PileFlowPanelView : DemoView
+  {
+    #region Initialization
+
+    public PileFlowPanelView()
+    {
+
+      InitializeComponent();
+
+    }
+
+    #endregion
+
+
+
+
+
+
+
+
+
+
+
+
+    #region Implementation
+
+
+
+
+
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
new file mode 100644
index 000000000..5bd0d3038
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Converters/DimensionConverter.cs
@@ -0,0 +1,51 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Converters
+{
+  public class DimensionsConverter : IValueConverter
+  {
+    static Dimension _originalValue; // the static struct that stores original value at the start of editing
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      _originalValue = ( ( Dimension )value );
+
+      if( parameter.ToString() == "Height" )
+        return ( ( Dimension )value ).Height;
+      if( parameter.ToString() == "Weight" )
+        return ( ( Dimension )value ).Weight;
+
+      return _originalValue;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( parameter.ToString() == "Height" )
+        _originalValue = new Dimension( double.Parse( value.ToString() ), _originalValue.Weight );
+      if( parameter.ToString() == "Weight" )
+        _originalValue = new Dimension( _originalValue.Height, double.Parse( value.ToString() ) );
+
+      return _originalValue;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CategoryOrdering.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CategoryOrdering.png
new file mode 100644
index 000000000..492e32617
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CategoryOrdering.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt
new file mode 100644
index 000000000..84860462b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt
@@ -0,0 +1,21 @@
+﻿
+<xctk:PropertyGrid >
+    <xctk:PropertyGrid.Properties>
+
+      <xctk:CustomPropertyItem DisplayName="First Name" 
+                               Value="Nancy" 
+                               Category="Name" />
+
+      <xctk:CustomPropertyItem DisplayName="Age" 
+                               Value="29" 
+                               Category="Other" 
+                               DefinitionKey="{x:Type s:Int32}" />
+            
+      <xctk:CustomPropertyItem DisplayName="Picture" Category="Other">
+          <xctk:CustomPropertyItem.Editor>
+            <Image Source="/Samples/PropertyGrid/Resources/woman.png" />
+          </xctk:CustomPropertyItem.Editor>
+      </xctk:CustomPropertyItem>
+
+    </xctk:PropertyGrid.Properties>
+</xctk:PropertyGrid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.cs.txt
new file mode 100644
index 000000000..b81c8d402
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.cs.txt
@@ -0,0 +1,10 @@
+﻿
+private class Person
+{
+  [DefinitionKey( "nameType" )]
+  public string FirstName { get; set; }
+  [DefinitionKey( "nameType" )]
+  public string LastName { get; set; }
+  [DefinitionKey( typeof( int? ) )]
+  public object ReferenceNo { get; set; }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt
new file mode 100644
index 000000000..6ca85062e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt
@@ -0,0 +1,12 @@
+﻿
+<xctk:PropertyGrid >
+    <xctk:PropertyGrid.EditorDefinitions>
+
+      <!-- This EditorDefinition will be used for FirstName and LastName -->
+      <xctk:EditorTextDefinition TargetProperties="nameType" 
+                                 FontStyle="Italic" 
+                                 FontWeight="Bold" />
+
+    </xctk:PropertyGrid.EditorDefinitions>
+</xctk:PropertyGrid>
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt
new file mode 100644
index 000000000..e04d94c9d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt
@@ -0,0 +1,23 @@
+
+<xctk:PropertyGrid>
+  <xctk:PropertyGrid.EditorDefinitions>
+
+    <xctk:EditorComboBoxDefinition TargetProperties="..."
+                                   ItemsSource="{StaticResource comboSource}"
+                                   SelectedItemBinding="{Binding Value}" />
+
+    <xctk:EditorTextDefinition TargetProperties="..."
+                               FontStyle="Italic" 
+                               FontWeight="Bold" 
+                               EditingElementStyle="{StaticResource textBoxStyle}"  />
+
+    <xctk:EditorDateTimeUpDownDefinition TargetProperties="..."
+                                         Format="Custom" 
+                                         FormatString="yyyy-MM" />
+
+    <xctk:EditorCheckBoxDefinition TargetProperties="..."
+                                   IsThreeState="True"  />
+
+  </xctk:PropertyGrid.EditorDefinitions>
+</xctk:PropertyGrid>
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Localization.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Localization.png
new file mode 100644
index 000000000..5c1bf8ee3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Localization.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/MultiSelectedObjects.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/MultiSelectedObjects.png
new file mode 100644
index 000000000..18b42ef63
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/MultiSelectedObjects.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.cs.txt
new file mode 100644
index 000000000..71d70be0a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.cs.txt
@@ -0,0 +1,8 @@
+﻿
+public class Employee
+{
+  public string Name { get; set; }
+  public bool IsConfirmed { get; set; }
+  public string Department { get; set; }
+}
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt
new file mode 100644
index 000000000..c134db16d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt
@@ -0,0 +1,20 @@
+﻿
+<xctk:PropertyGrid PropertyNameBinding="{Binding Name}"
+                   SelectedObjectName="Meeting" >
+  
+  <xctk:PropertyGrid.Properties>
+      <v:Employee Name="Tom" IsConfirmed="True" Department="Sales"/>
+      <v:Employee Name="John" IsConfirmed="false" Department="Management"/>
+      <v:Employee Name="Sean" IsConfirmed="True" Department="Sales"/>
+  </xctk:PropertyGrid.Properties>
+
+  <xctk:PropertyGrid.DefaultEditorDefinition>
+      <xctk:EditorCheckBoxDefinition Binding="{Binding IsConfirmed}"/>
+  </xctk:PropertyGrid.DefaultEditorDefinition>
+
+  <xctk:PropertyGrid.CategoryGroupDescription>
+      <PropertyGroupDescription PropertyName="Department" />
+  </xctk:PropertyGrid.CategoryGroupDescription>
+
+  </xctk:PropertyGrid.EditorDefinitions>
+</xctk:PropertyGrid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.cs.txt
new file mode 100644
index 000000000..d5acd2acd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.cs.txt
@@ -0,0 +1,6 @@
+﻿
+private class MyData
+{
+  public string MyName { get; set; }
+  public object MyValue { get; set; }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt
new file mode 100644
index 000000000..e7c46b009
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt
@@ -0,0 +1,5 @@
+﻿
+<xctk:PropertyGrid PropertiesSource="{Binding MyDataList}"
+                   PropertyNameBinding="{Binding MyName}"
+                   PropertyValueBinding="{Binding MyValue}" />
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
new file mode 100644
index 000000000..1685129f2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml
@@ -0,0 +1,24 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<UserControl x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.LastNameUserControlEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             x:Name="_uc">
+   <StackPanel>
+      <TextBox Text="{Binding Value, ElementName=_uc}" Background="YellowGreen" />
+      <Button Click="Button_Click">Clear</Button>
+   </StackPanel>
+</UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
similarity index 92%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
index 4f0f9eb96..64615705d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
@@ -2,7 +2,7 @@
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
@@ -22,7 +22,7 @@ projects. The commercial version of Extended WPF Toolkit also includes
 using System.Windows.Data;
 using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
 
-namespace Samples.Modules.PropertyGrid
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid
 {
   /// <summary>
   /// Interaction logic for LastNameUserControlEditor.xaml
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/woman.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/woman.png
new file mode 100644
index 000000000..b8fa7d5ff
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Resources/woman.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
similarity index 93%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
index fcec1ffd6..667ee5316 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.Designer.cs
@@ -1,14 +1,14 @@
 ﻿//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.269
+//     Runtime Version:4.0.30319.296
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace Samples.Modules.PropertyGrid.Views {
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views {
     using System;
 
 
@@ -39,7 +39,7 @@ internal DisplayLocalizationRes() {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Modules.PropertyGrid.Views.DisplayLocalizationRes", typeof(DisplayLocalizationRes).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.DisplayLocalizationRes", typeof(DisplayLocalizationRes).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.fr.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.fr.resx
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.fr.resx
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.fr.resx
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.resx
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DisplayLocalizationRes.resx
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/DisplayLocalizationRes.resx
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
new file mode 100644
index 000000000..4a0853638
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml
@@ -0,0 +1,94 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridAttributesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:col="clr-namespace:System.Collections;assembly=mscorlib"
+                xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                x:Name="demo"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Using Attributes">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+          This sample expose how you can use Attributes to customize the display of the properties in the PropertyGrid.
+           With attributes you can, for each properties, customize their own category, display property, display name, display order, description, editor, editor combox items,
+           and expandability (drill down). Here is the list of all supported attributes:
+         <LineBreak />
+         <LineBreak />
+           BrowsableAttribute
+         <LineBreak />
+           DisplayNameAttribute
+         <LineBreak/>
+            DescriptionAttribute
+         <LineBreak/>
+           CategoryAttribute
+         <LineBreak/>
+           EditorAttribute
+         <LineBreak/>
+           NewItemTypesAttribute
+         <LineBreak/>
+           ExpandableObjectAttribute
+         <LineBreak/>
+           ItemsSourceAttribute
+         <LineBreak/>
+           PropertyOrderAttribute
+         <LineBreak/>
+           ParenthesizePropertyNameAttribute
+         <LineBreak/>
+         <LineBreak/>
+         Plus edition Only:
+         <LineBreak/>
+         (Not demoed here. See corresponding samples)
+         <LineBreak/>
+         DefinitionKeyAttribute
+         <LineBreak/>
+         CategoryOrderAttribute
+         <LineBreak/>
+         LocalizedCategoryAttribute
+         <LineBreak/>
+         LocalizedDisplayNameAttribute
+         <LineBreak/>
+         LocalizedDescriptionAttribute
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="Each property in this PropertyGrid has its own special attribute that applies a different effect when it is displayed." 
+                  TextWrapping="Wrap" Margin="5"/>
+         <TextBlock Text="Select each property one-by-one and take a look at the description section to learn more about each attribute." 
+                  TextWrapping="Wrap" Margin="5"/>         
+         <TextBlock Text="All properties define the CategoryAttribute (eg. 'Information','Conections') and the DescriptionAttribute." 
+                  TextWrapping="Wrap" Margin="5"/>
+         <TextBlock Text="(CLick the XAML and Code tabs to see details.)" 
+                    FontStyle="Italic"
+                    Margin="0,10,0,0"/>
+      </StackPanel>
+
+      <xctk:PropertyGrid Grid.Row="1" x:Name="_propertyGrid" Width="450" MaxHeight="650" Margin="10" 
+                         SelectedObject="{Binding}">
+      </xctk:PropertyGrid>      
+
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
new file mode 100644
index 000000000..4e1b9f8b7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAttributesView.xaml.cs
@@ -0,0 +1,193 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridEditorAttributeView.xaml
+  /// </summary>
+  public partial class PropertyGridAttributesView : DemoView
+  {
+    public PropertyGridAttributesView()
+    {
+      InitializeComponent();
+
+      var person = new Man();
+      person.FirstName = "John";
+      person.LastName = "Doe";
+      person.WritingFontSize = 12;
+      person.Friends = new List<Person>() { new Man() { FirstName = "First", LastName = "Friend" }, new Woman() { FirstName = "Second", LastName = "Friend" } };
+      person.Spouse = new Woman()
+      {
+        FirstName = "Jane",
+        LastName = "Doe"
+      };
+
+      this.DataContext = person;
+
+    }
+  }
+
+  public abstract class Person
+  {
+    // All properties have their own "[Category(...)]" attribute to specify which category they
+    // belong to when the "Categorized" layout is used by the PropertyGrid.
+
+    [Category( "Information" )]
+    [Description( "This property uses the [DisplayName(\"Is a Men\")] attribute to customize the name of this property." )]
+    [DisplayName( "Is male" )]
+    public bool IsMale { get; protected set; }
+
+    [Category( "Information" )]
+    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class" )]
+    [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
+    public string FirstName { get; set; }
+
+    [Category( "Information" )]
+    [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )]
+    [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
+    public string LastName { get; set; }
+
+    [Category( "Conections" )]
+    [Description( "This property uses the [NewItemTypes(...)] attribute to provide the underlying CollectionEditor with class types (eg. Man, Woman) that can be inserted in the collection." )]
+    [NewItemTypes( typeof( Man ), typeof( Woman ) )]
+    public List<Person> Friends { get; set; }
+
+    [Category( "Information" )]
+    [DisplayName( "Writing Font Size" )]
+    [Description( "This property defines the [ItemsSource(..)] attribute that allows you to specify a ComboBox editor and control its items." )]
+    [ItemsSource( typeof( FontSizeItemsSource ) )]
+    public double WritingFontSize { get; set; }
+
+    [Category( "Conections" )]
+    [Description( "This property defines the [ExpandableObject()] attribute. This allows you to expand this property and drill down through its values." )]
+    [ExpandableObject()]
+    public Person Spouse { get; set; }
+
+    [Category( "Other" )]
+    [Description( "This property uses the [PropertyOrder(1)] attribute to control its position in the categorized and non-categorized views. Otherwise, alphabetical order is used." )]
+    [PropertyOrder( 1 )]
+    public string A_SecondProperty { get; set; }
+
+    [Category( "Other" )]
+    [Description( "This property uses the [PropertyOrder(0)] attribute to control its position in the categorized and non-categorized view. Otherwise, alphabetical order is used." )]
+    [PropertyOrder( 0 )]
+    public string B_FirstProperty { get; set; }
+
+    [Category( "Other" )]
+    [Description( "This property uses the [ParenthesizePropertyName()] attribute to force the name to be displayed within round brackets." )]
+    [ParenthesizePropertyNameAttribute(true)]
+    public string NameInParentheses { get; set; }
+
+    [Category( "Other" )]
+    [Description( "This property uses the [Browsable(false)] attribute to not display the property" )]
+    [BrowsableAttribute( false )]
+    public string InvisibleProperty
+    {
+      get;
+      set;
+    }
+
+    public override string ToString()
+    {
+      return FirstName + " " + LastName;
+    }
+  }
+
+  // The "Man" and "Woman" classes are referenced by the "NewItemTypesAttribute"
+  // of the "Friends" property.
+  //
+  // Theses are the types that can be instantiated in the CollectionEditor
+  // of the property.
+  public class Man : Person
+  {
+    [Category( "Information" )]
+    [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )]
+    public string FavoriteSport { get; set; }
+    public Man() { this.IsMale = true; }
+  }
+  public class Woman : Person
+  {
+    [Category( "Information" )]
+    [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )]
+    public string FavoriteRestaurant { get; set; }
+    public Woman() { this.IsMale = false; }
+  }
+
+  // This is the custom editor referenced by the "EditorAttribute"
+  // of the "FirstName" property.
+  //
+  // This class must implement the
+  //   Xceed.Wpf.Toolkit.PropertyGrid.Editors.ITypeEditor 
+  // interface
+  public class FirstNameEditor : Xceed.Wpf.Toolkit.PropertyGrid.Editors.ITypeEditor
+  {
+    public FrameworkElement ResolveEditor( Xceed.Wpf.Toolkit.PropertyGrid.PropertyItem propertyItem )
+    {
+      TextBox textBox = new TextBox();
+      textBox.Background = new SolidColorBrush( Colors.Red );
+
+      //create the binding from the bound property item to the editor
+      var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
+      return textBox;
+    }
+  }
+
+  // This is the ItemsSource provider referenced by the "ItemsSourceAttribute"
+  // of the "WritingFontSize" property.
+  //
+  // This class must implement the
+  //   Xceed.Wpf.Toolkit.PropertyGrid.Attributes.IItemsSource 
+  // interface
+  public class FontSizeItemsSource : IItemsSource
+  {
+    public Xceed.Wpf.Toolkit.PropertyGrid.Attributes.ItemCollection GetValues()
+    {
+      var sizes = new Xceed.Wpf.Toolkit.PropertyGrid.Attributes.ItemCollection();
+      sizes.Add( 5.0, "Five" );
+      sizes.Add( 5.5 );
+      sizes.Add( 6.0, "Six" );
+      sizes.Add( 6.5 );
+      sizes.Add( 7.0, "Seven" );
+      sizes.Add( 7.5 );
+      sizes.Add( 8.0, "Eight" );
+      sizes.Add( 8.5 );
+      sizes.Add( 9.0, "Nine" );
+      sizes.Add( 9.5 );
+      sizes.Add( 10.0 );
+      sizes.Add( 12.0, "Twelve" );
+      sizes.Add( 14.0 );
+      sizes.Add( 16.0 );
+      sizes.Add( 18.0 );
+      sizes.Add( 20.0 );
+      return sizes;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
new file mode 100644
index 000000000..25d50a4a3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml
@@ -0,0 +1,69 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridBindingToStructsView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Converters"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:propertyGrid="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="PropertyGrid Binding to Structs">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            When the SelectedObject contains properties of type Struct youmay find that edits performed in the PropertyGrid do not function properly.  This is because Structs are passed by value.  Meaning that the PropertyGrid receives a copy of the Struct and not a reference.  When this happens, the data binding expressions end up binding to and modifying that copy rather than the original values.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <conv:DimensionsConverter x:Key="DimensionsConverter" />
+   </local:DemoView.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Binding to Structs:" Style="{StaticResource Header}" Margin="10"/>
+      <TextBlock Grid.Row="1" Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
+      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="2" Width="450" MaxHeight="250" Margin="10">
+         <xctk:PropertyGrid.EditorDefinitions>
+            <xctk:EditorTemplateDefinition TargetProperties="{x:Type propertyGrid:Dimension}">
+               <xctk:EditorTemplateDefinition.EditingTemplate>
+                  <DataTemplate>
+                     <Grid Margin="5">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock Text="Height: " />
+                        <TextBox Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Height}" />
+                        <TextBlock Grid.Row="1" Text="Weight: " />
+                        <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Weight}" />
+                     </Grid>
+                  </DataTemplate>
+               </xctk:EditorTemplateDefinition.EditingTemplate>
+            </xctk:EditorTemplateDefinition>
+         </xctk:PropertyGrid.EditorDefinitions>
+      </xctk:PropertyGrid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
new file mode 100644
index 000000000..31d0d51d4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridBindingToStructsView.xaml.cs
@@ -0,0 +1,86 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.ComponentModel;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridBindingToStructsView.xaml
+  /// </summary>
+  public partial class PropertyGridBindingToStructsView : DemoView
+  {
+    public PropertyGridBindingToStructsView()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      public Dimension Dimensions
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.Dimensions = new Dimension()
+        {
+          Height = 75.0,
+          Weight = 185.76
+        };
+        return person;
+      }
+    }
+  }
+
+  public struct Dimension
+  {
+    public double Height;
+    public double Weight;
+
+    public Dimension( double height, double weight )
+    {
+      this.Height = height;
+      this.Weight = weight;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
new file mode 100644
index 000000000..c060c13b3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml
@@ -0,0 +1,48 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridCategoryOrderView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="PropertyGrid Category Ordering">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>When the PropertyGrid is Categorized, the CategoryOrder attribute allows you to specify the order in which the categoriess should be displayed.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>The PropertyGrid on the left displays non-ordered categories, where the important information is at the bottom of the PropertyGrid.</Run>
+            <LineBreak />
+            <Run>The PropertyGrid on the right uses the CategoryOrder attribute to order the categories in the desired order.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\CategoryOrdering.png" Width="600" Height="400"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
new file mode 100644
index 000000000..9853f78ac
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCategoryOrderView.xaml.cs
@@ -0,0 +1,48 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridCategoryOrderView.xaml
+  /// </summary>
+  public partial class PropertyGridCategoryOrderView : DemoView
+  {
+    public PropertyGridCategoryOrderView()
+    {
+      InitializeComponent();
+    }
+
+
+
+
+
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
new file mode 100644
index 000000000..92a70ed97
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
@@ -0,0 +1,123 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridCustomEditorsView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:col="clr-namespace:System.Collections;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Using EditorTemplateDefinition">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            This example demonstrates the various methods of assigning custom editors to the properties. You can supply your own editor DataTemplate based on a Type, a property name, or both. To supply your own editor for a property, you must create an EditorDefinition for the PropertyGrid.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="Click each property and look at the description to understand why the property is affected by a custom DataTemplate."
+                    TextWrapping="Wrap"/>
+         <TextBlock Text="(CLick the XAML and Code tabs to see details.)" 
+                    FontStyle="Italic"
+                    Margin="0,10,0,0"/>
+      </StackPanel>
+      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" 
+                         Width="450" MaxHeight="375" Margin="10"
+                         SelectedObject="{Binding}">
+            <xctk:PropertyGrid.EditorDefinitions>
+
+               <!--  EditorTemplateDefinition #1
+               This EditorTemplateDefinition will provide a green TextBox to:
+               1) All properties of type Double
+               Replacing the default editor. -->
+               <xctk:EditorTemplateDefinition TargetProperties="{x:Type sys:Double}">
+                  <xctk:EditorTemplateDefinition.EditingTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Green"  Text="{Binding Value}" />
+                        <!-- 
+                        When using SelectedObject[s] bind to the "Value" property 
+
+                        When using PropertiesSource or Properties to specify your items,
+                        your DataContext will be the item itself, so bind directly to the 
+                        property of your underlying item, hence, probably the same path as 
+                        the one you specified on the 'PropertyValueBinding'
+                        property of your property grid.
+                        -->
+                     </DataTemplate>
+                  </xctk:EditorTemplateDefinition.EditingTemplate>
+               </xctk:EditorTemplateDefinition>
+
+               <!--  EditorTemplateDefinition #2
+               This EditorTemplateDefinition will provide a yellow TextBox to:
+               1) The property named "LastName"
+               2) The property named "FirstName"
+               3) The property named "Spouse"
+               Replacing the default editor. -->
+               <xctk:EditorTemplateDefinition TargetProperties="FirstName,LastName,WritingFont">
+                  <xctk:EditorTemplateDefinition.EditingTemplate>
+                     <DataTemplate>
+                        <TextBlock Background="Yellow" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </xctk:EditorTemplateDefinition.EditingTemplate>
+               </xctk:EditorTemplateDefinition>
+
+               <!--  EditorTemplateDefinition #3
+               This EditorTemplateDefinition will provide a red TextBox to:
+               1) The property named "Age"
+               2) All properties of type DateTime
+               Replacing the default editor. -->
+               <xctk:EditorTemplateDefinition >
+                  <xctk:EditorTemplateDefinition.TargetProperties>
+                     <sys:String>Age</sys:String>
+                     <xctk:TargetPropertyType Type="{x:Type sys:DateTime}" />
+                  </xctk:EditorTemplateDefinition.TargetProperties>
+                  <xctk:EditorTemplateDefinition.EditingTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Red" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </xctk:EditorTemplateDefinition.EditingTemplate>
+               </xctk:EditorTemplateDefinition>
+
+               <!--  EditorTemplateDefinition #4
+               This EditorTemplateDefinition will provide a aquamarine TextBox to:
+               1) All properties of type "bool" (Boolean)
+               2) All properties of type HorizontalAlignment
+               3) All properties of type FontFamily
+               Replacing the default editor. -->
+               <xctk:EditorTemplateDefinition >
+                  <xctk:EditorTemplateDefinition.TargetProperties>
+                     <xctk:TargetPropertyType Type="{x:Type sys:Boolean}" />
+                  <xctk:TargetPropertyType Type="{x:Type HorizontalAlignment}" />
+                  <xctk:TargetPropertyType Type="{x:Type FontFamily}" />
+               </xctk:EditorTemplateDefinition.TargetProperties>
+                  <xctk:EditorTemplateDefinition.EditingTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Aquamarine" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </xctk:EditorTemplateDefinition.EditingTemplate>
+               </xctk:EditorTemplateDefinition>
+
+            </xctk:PropertyGrid.EditorDefinitions>
+         </xctk:PropertyGrid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
new file mode 100644
index 000000000..e0319beab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml.cs
@@ -0,0 +1,136 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridCustomEditorsView.xaml
+  /// </summary>
+  public partial class PropertyGridCustomEditorsView : DemoView
+  {
+    public PropertyGridCustomEditorsView()
+    {
+      InitializeComponent();
+
+      var person = new Person();
+      person.FirstName = "John";
+      person.LastName = "Doe";
+      person.DateOfBirth = new System.DateTime( 1975, 1, 23 );
+      person.Age = System.DateTime.Today.Year - person.DateOfBirth.Year;
+      person.GradePointAvg = 3.98;
+      person.IsMale = true;
+      person.FavoriteColor = Colors.Blue;
+      person.WritingFont = new FontFamily( "Arial" );
+      person.WritingHand = System.Windows.HorizontalAlignment.Right;
+      person.WritingFontSize = 12.5;
+
+
+      this.DataContext = person;
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #2 because it targets the property named 'FirstName'." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #2 because it targets the property named 'LastName'." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #3 because it targets all properties of Type 'DateTime'." )]
+      public System.DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #1 because it targets all properties of Type 'Double'." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #3 because it targets the property named 'Age'." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #4 because it targets all properties of Type 'Boolean'." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the default editor because no EditorDefinition targets this property name or type." )]
+      public System.Windows.Media.Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #4 because it targets all properties of Type 'HorizontalAlignment'." )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #2 because it targets the property named 'WritingFont'. Although EditorTemplateDefinition #4 targets 'FontFamily' type, priority is given to the name." )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [Description( "This property uses the editor defined by EditorTemplateDefinition #1 because it targets all properties of Type 'Double'." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
new file mode 100644
index 000000000..b9a7f467f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml
@@ -0,0 +1,61 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridCustomPropertyView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Custom Properties">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+         Using the CustomPropertyItems class, you can flexibly modify the display of each of your properties.
+            <LineBreak />
+           <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="This sample adds 'CustomPropertyItem' to the 'Properties' collection and directly controls the display of each item."
+                    TextWrapping="Wrap"/>
+      </StackPanel>
+      <ScrollViewer Grid.Row="1" 
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto">
+         <StackPanel>
+            <TextBlock Text="Xaml :" Margin="0,10,0,0" />
+            <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/CustomProperty.xaml.txt" />
+         </StackPanel>
+      </ScrollViewer>      
+
+
+
+
+
+   </Grid>      
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
new file mode 100644
index 000000000..3877f7ac9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomPropertyView.xaml.cs
@@ -0,0 +1,39 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using System.Linq;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridCustomPropertyView.xaml
+  /// </summary>
+  public partial class PropertyGridCustomPropertyView : DemoView
+  {
+    public PropertyGridCustomPropertyView()
+    {
+      InitializeComponent();
+    }
+  }
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
new file mode 100644
index 000000000..91f8dcf3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml
@@ -0,0 +1,40 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridDefaultEditorsView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                VerticalScrollBarVisibility="Disabled"
+                Title="PropertyGrid Default Editors">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           This example demonstrates the default editors provided by the PropertyGrid. A different editor exists for each
+           of the following types (C# name): string, bool, decimal, int, short, long, float, byte, sbyte, uint, ulong, ushort, 
+           DateTime, TimeSpan, Color, Enums, FontFamily, FontWeight, FontStyle, FontStretch, 
+           IList&lt;T&gt; (primtive type), IList&lt;T&gt; (custom type),
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <DockPanel>
+      <TextBlock DockPanel.Dock="Top" 
+                 Text="Click on each property and see the description for details on the underlying editor."
+                 TextWrapping="Wrap"/>
+      <xctk:PropertyGrid x:Name="_propertyGrid" SelectedObject="{Binding}"  Width="450" Margin="10,30,0,0" />
+   </DockPanel>
+
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
new file mode 100644
index 000000000..e8b0e014a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefaultEditorsView.xaml.cs
@@ -0,0 +1,145 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridDefaultEditorsView.xaml
+  /// </summary>
+  public partial class PropertyGridDefaultEditorsView : DemoView
+  {
+    public PropertyGridDefaultEditorsView()
+    {
+      InitializeComponent();
+
+      var selectedObject = new AllEditorTypes();
+      selectedObject.Boolean = true;
+      selectedObject.Byte = ( byte )1;
+      selectedObject.Color = Colors.Blue;
+      selectedObject.DateTime = System.DateTime.Now;
+      selectedObject.Double = (double)2;
+      selectedObject.Enum = HorizontalAlignment.Center;
+      selectedObject.FontFamily = new FontFamily( "Arial" );
+      selectedObject.FontStretch = FontStretches.Normal;
+      selectedObject.FontStyle = FontStyles.Italic;
+      selectedObject.FontWeight = FontWeights.Bold;
+      selectedObject.Int16 = ( short )3;
+      selectedObject.Int32 = (int)4;
+      selectedObject.Int64 = (long)5;
+      selectedObject.ListOfInt32 = new List<int>() { 1, 2, 3 };
+      selectedObject.ListOfPerson = new List<Person>() { new Person() { Name = "John Smith" }, new Person() { Name = "Robert King" } };
+      selectedObject.ListOfStrings = new List<string>() { "string1", "string2", "string3" };
+      selectedObject.Person = new Person() { Name = "John Smith" };
+      selectedObject.SByte = (sbyte) 6;
+      selectedObject.Single = (float)7;
+      selectedObject.String = "this is a string";
+      selectedObject.TimeSpan = TimeSpan.FromHours( 2 );
+      selectedObject.UInt16 = (ushort)8;
+      selectedObject.UInt32 = (uint)9;
+      selectedObject.UInt64 = (ulong)10;
+
+      this.DataContext = selectedObject;
+    }
+
+    public class AllEditorTypes
+    {
+      [Category( "Non-Numeric Editors" )]
+      [Description( "(C# string type) This property uses a TextBox as the default editor." )]
+      public string String { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "(C# bool type) This property uses a CheckBox as the default editor." )]
+      public bool Boolean { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# int type) This property uses an IntegerUpDown as the default editor." )]
+      public int Int32 { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# double type) This property uses a DoubleUpDown as the default editor." )]
+      public double Double { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# short type) This property uses a ShortUpDown as the default editor." )]
+      public short Int16 { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# long type) This property uses a LongUpDown as the default editor." )]
+      public long Int64 { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# float type) This property uses a SingleUpDown as the default editor." )]
+      public float Single { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# byte type) This property uses a ByteUpDown as the default editor." )]
+      public byte Byte { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# sbyte type) This property uses a SByteUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
+      public sbyte SByte { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# uint type) This property uses a UInteger as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
+      public uint UInt32 { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# ulong type) This property uses a ULongUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
+      public ulong UInt64 { get; set; }
+      [Category( "Numeric Editors" )]
+      [Description( "(C# ushort type) This property uses a UShortUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
+      public ushort UInt16 { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a DateTimeUpDown as the default editor." )]
+      public System.DateTime DateTime { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a DateTimeUpDown as the default editor." )]
+      public TimeSpan TimeSpan { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a ColorPicker as the default editor." )]
+      public System.Windows.Media.Color Color { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )]
+      public HorizontalAlignment Enum { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a ComboBox as the default editor." )]
+      public FontFamily FontFamily { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a ComboBox as the default editor." )]
+      public FontWeight FontWeight { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a ComboBox as the default editor." )]
+      public FontStyle FontStyle { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a ComboBox as the default editor." )]
+      public FontStretch FontStretch { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<string> ListOfStrings { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<int> ListOfInt32 { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "(C# IList<T> type) This property uses a CollectionEditor as the default editor." )]
+      public List<Person> ListOfPerson { get; set; }
+      [Category( "Non-Numeric Editors" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Person { get; set; }
+    }
+
+    public class Person
+    {
+      public string Name { get; set; }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
new file mode 100644
index 000000000..bc81f6a7d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
@@ -0,0 +1,69 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridDefinitionKeyView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Using DefinitionKeyAttribute">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The DefinitionKey attribute can be assigned to properties of your selected object to define which EditorDefinition to
+           be applied to the property.
+         <LineBreak/>
+         <LineBreak/>
+         As an alternative to the Editor attribute, this allows you separate the UI-specific code from your 
+           business model code.
+         <LineBreak/>
+         <LineBreak/>
+           It can also be used to specify a specific default editor when a property type does not resolve to a valid editor (e.g., Object).
+            <LineBreak />
+           <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="20">
+         <TextBlock Text="Here the FirstName and LastName DefinitionKey attribute refer to the same 'nameType' EditorDefinition" 
+                    TextWrapping="Wrap"
+                    Margin="0,0,0,10"/>
+         <TextBlock Text="The ReferenceNo property, declare a DefinitionKey to 'int?' to displayed the content with a IntegerUpDown dispite it's type is 'object'" 
+                    TextWrapping="Wrap"
+                    Margin="0,0,0,10"/>
+      </StackPanel>
+      <ScrollViewer Grid.Row="1" 
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto">
+         <StackPanel>
+            <TextBlock Text="C# :" Margin="0,10,0,0" />
+            <local:CSharpBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.cs.txt" />
+            <TextBlock Text="Xaml :" Margin="0,10,0,0" />
+            <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/DefinitionKey.xaml.txt" />
+         </StackPanel>
+      </ScrollViewer>      
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
new file mode 100644
index 000000000..952e73ca4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml.cs
@@ -0,0 +1,35 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridDefinitionKeyView.xaml
+  /// </summary>
+  public partial class PropertyGridDefinitionKeyView : DemoView
+  {
+    public PropertyGridDefinitionKeyView()
+    {
+      InitializeComponent();
+
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
new file mode 100644
index 000000000..f8888a26a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml
@@ -0,0 +1,47 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridDisplayLocalizationView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="PropertyGrid Localization"
+                 VerticalScrollBarVisibility="Disabled"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>ExtendedDisplayNameAttribute:</Run>
+            <LineBreak/>
+            <Run>In conjunction with the EnumDisplayNameConverter type converter, this attribute allows a DisplayName to be specified on members that are not allowed by the Framework DisplayName attribute, such as fields and enum values.</Run>
+            <LineBreak/>
+            <LineBreak/>
+            <Run>LocalizedDisplayName, LocalizedDescription, LocalizedCategory:</Run>
+            <LineBreak/>
+            <Run>Theses attributes allow to easily localize the DisplayName, Description, and Category attributes values using standard Resx resource files.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+    <Image Source="..\OpenSourceImages\Localization.png" Width="400" Height="300"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
new file mode 100644
index 000000000..0eb95a16a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDisplayLocalizationView.xaml.cs
@@ -0,0 +1,53 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.Core;
+using System.Windows.Controls;
+using System.Globalization;
+using System.Threading;
+using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridDisplayLocalizationView.xaml
+  /// </summary>
+  public partial class PropertyGridDisplayLocalizationView : DemoView
+  {
+
+    public PropertyGridDisplayLocalizationView()
+    {
+      InitializeComponent();
+
+    }
+
+
+
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
new file mode 100644
index 000000000..5b45228cd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml
@@ -0,0 +1,86 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridEditorDefinitionsView"
+                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"
+                xmlns:sm="clr-namespace:System.Windows.Media;assembly=PresentationCore"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Ready-to-use EditorDefinitions">
+
+
+
+
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+         Using the various EditorDefinitions provided with the PropertyGrid, you can easily customize and reuse the existing default editor to suit your needs. Style the editing element or use one of the common properties directly provided on the editor definition class. The provided editor definitions are the following:
+         <LineBreak/>
+         <LineBreak/>
+         EditorCheckBoxDefinition
+         <LineBreak/>
+         EditorColorPickerDefinition
+         <LineBreak/>
+         EditorComboBoxDefinition
+         <LineBreak/>
+         EditorDateTimeUpDownDefinition
+         <LineBreak/>
+         EditorTextDefinition
+         <LineBreak/>
+         EditorTemplateDefinition
+         <LineBreak/>
+         <LineBreak/>
+         And all numeric editor definitions:
+         <LineBreak />
+         <LineBreak />
+         EditorIntegerUpDownDefinition
+         <LineBreak />
+         EditorDoubleUpDownDefinition
+            <LineBreak />
+         <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Extended WPF Toolkit Plus.
+            </Hyperlink>
+         etc.
+      </Paragraph>
+   </local:DemoView.Description>
+
+   <DockPanel>
+      <StackPanel DockPanel.Dock="Top">
+         <TextBlock Text="Each of the displayed properties has their display or behavior affected by an different EditorDefinition "
+                 TextWrapping="Wrap"/>
+      </StackPanel>
+      <ScrollViewer VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto">
+         <StackPanel>
+            <TextBlock Text="Xaml :" Margin="0,10,0,0" />
+            <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/EditorDefinitions.xaml.txt" />
+         </StackPanel>
+      </ScrollViewer>      
+
+
+
+
+
+
+   </DockPanel>
+
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
new file mode 100644
index 000000000..979cc93c2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorDefinitionsView.xaml.cs
@@ -0,0 +1,40 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridEditorDefinitionsView.xaml
+  /// </summary>
+  public partial class PropertyGridEditorDefinitionsView : DemoView
+  {
+    public PropertyGridEditorDefinitionsView()
+    {
+      InitializeComponent();
+
+    }
+
+
+  }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
new file mode 100644
index 000000000..3417de7a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml
@@ -0,0 +1,41 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridMultiSelectedObjectsView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="PropertyGrid Multi-Selected Objects">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>When many objects are assigned to a PropertyGrid, the PpropertyGrid will show all the common properties so that they can be changed simultaneously on each object.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\MultiSelectedObjects.png" Width="700" Height="450"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
new file mode 100644
index 000000000..1d1a1c301
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridMultiSelectedObjectsView.xaml.cs
@@ -0,0 +1,44 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridMultiSelectedObjectsView.xaml
+  /// </summary>
+  public partial class PropertyGridMultiSelectedObjectsView : DemoView
+  {
+    public PropertyGridMultiSelectedObjectsView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
new file mode 100644
index 000000000..a65d3a504
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml
@@ -0,0 +1,64 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridPropertiesSourceView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                 Title="Custom Properties List">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           When setting the PropertiesSource or Properties property, you can provide your own data to be displayed in the PropertyGrid. This allows you to easily insert and remove properties at runtime. The usage scheme is similar to the one used for the standard ItemsControl.
+            <LineBreak />
+           <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="This sample uses the 'PropertiesSource', 'PropertyNameBinding', and 'PropertyValueBinding', as well as collection of generic objects to display its properties."
+                    TextWrapping="Wrap"/>
+      </StackPanel>
+      <ScrollViewer Grid.Row="2" 
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto">
+         <StackPanel>
+            <TextBlock Text="C# :" Margin="0,10,0,0" />
+            <local:CSharpBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.cs.txt" />
+            <TextBlock Text="Xaml :" Margin="0,10,0,0" />
+            <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/PropertiesSource.xaml.txt" />
+         </StackPanel>
+      </ScrollViewer>      
+
+
+
+
+
+
+   </Grid>      
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
new file mode 100644
index 000000000..54c9ac466
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesSourceView.xaml.cs
@@ -0,0 +1,41 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using System.Linq;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridPropertiesSourceView.xaml
+  /// </summary>
+  public partial class PropertyGridPropertiesSourceView : DemoView
+  {
+    public PropertyGridPropertiesSourceView()
+    {
+      InitializeComponent();
+
+    }
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
new file mode 100644
index 000000000..b8a86aec8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml
@@ -0,0 +1,67 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridPropertiesView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Property Element Syntax">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+         This sample demonstrate the usage of Property Element syntax that offers the option to provide property data directly in XAML.
+         <LineBreak/>
+         <LineBreak/>
+           The sample also demonstrate the usage of CategoryGroupDescription to control the categorization of the elements.
+            <LineBreak />
+           <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="10">
+         <TextBlock Text="This sample adds Employee items directly under the Properties property and defines the editor through the DefaultEditorDefinition property."
+                    TextWrapping="Wrap"/>
+      </StackPanel>
+      <ScrollViewer Grid.Row="1" 
+                    VerticalScrollBarVisibility="Auto"
+                    HorizontalScrollBarVisibility="Auto">
+         <StackPanel>
+            <TextBlock Text="C# :" Margin="0,10,0,0" />
+            <local:CSharpBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/Properties.cs.txt" />
+            <TextBlock Text="Xaml :" Margin="0,10,0,0" />
+            <local:XamlBox CodeSource="/Samples/PropertyGrid/OpenSourceImages/Properties.xaml.txt" />
+         </StackPanel>
+      </ScrollViewer>      
+
+
+
+
+
+
+   </Grid>      
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
new file mode 100644
index 000000000..b20fa5af5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertiesView.xaml.cs
@@ -0,0 +1,38 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using System.Linq;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridPropertiesView.xaml
+  /// </summary>
+  public partial class PropertyGridPropertiesView : DemoView
+  {
+    public PropertyGridPropertiesView()
+    {
+      InitializeComponent();
+    }
+  }
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
new file mode 100644
index 000000000..fb4b58ab2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml
@@ -0,0 +1,62 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridPropertyItemStyleView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:v="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Customizing PropertyItems display">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+         This sample demonstrates the usage of the PropertyGrid's
+         <Bold>PropertyContainerStyle</Bold> property and
+         <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="10" >
+         <TextBlock Text="Using the PropertyContainerStyle property, the Foreground of all properties are set to Red."
+                    TextWrapping="Wrap"
+                    Margin="0,0,0,10"/>
+         <TextBlock Text="Using the PreparePropertyItem event, the display name of the property 'Friend' is changed to 'Friend (renamed)'."
+                    TextWrapping="Wrap"
+                    Margin="0,0,0,10"/>         
+         <TextBlock Text="(CLick the XAML and Code tabs to see details,)" 
+                    FontStyle="Italic"
+                    Margin="0,10,0,0"/>
+      </StackPanel>
+
+
+      <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="350" MaxHeight="300"
+                         SelectedObject="{Binding}"
+                         PreparePropertyItem="OnPreparePropertyItem">
+         <xctk:PropertyGrid.PropertyContainerStyle>
+            <!--This style will be set to all PropertyItem instances (direct and expanded) in the property grid. -->
+            <Style TargetType="{x:Type xctk:PropertyItemBase}">
+               <Setter Property="Foreground" Value="Red" />
+            </Style>
+         </xctk:PropertyGrid.PropertyContainerStyle>
+      </xctk:PropertyGrid>
+   </Grid>      
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
new file mode 100644
index 000000000..0024c87e1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridPropertyItemStyleView.xaml.cs
@@ -0,0 +1,65 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+using System.Linq;
+using System.Collections.ObjectModel;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridPropertyItemStyleView.xaml
+  /// </summary>
+  public partial class PropertyGridPropertyItemStyleView : DemoView
+  {
+    public PropertyGridPropertyItemStyleView()
+    {
+      InitializeComponent();
+
+      var selObject = new Person();
+      selObject.Friend = new Person();
+
+      this.DataContext = selObject;
+    }
+
+    private void OnPreparePropertyItem( object sender, PropertyItemEventArgs e )
+    {
+      var propertyItem = e.PropertyItem as PropertyItem;
+      // Parent of top-level properties is the PropertyGrid itself.
+      bool isTopLevelProperty = 
+        ( propertyItem.ParentElement is Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid );
+
+      if( isTopLevelProperty && propertyItem.PropertyDescriptor.Name == "Friend" )
+      {
+        propertyItem.DisplayName = "Friend (renamed)";
+      }
+    }
+
+    private class Person
+    {
+      public string FirstName { get; set; }
+      public string LastName { get; set; }
+      [ExpandableObject()]
+      public Person Friend { get; set; }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
new file mode 100644
index 000000000..e8b28cffc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
@@ -0,0 +1,59 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridSelectedObjectView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="Using SelectedObject(s)">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+         When setting the SelectedObject property to an instance of an item, you can modify the values of the object properties.
+      </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition />
+      </Grid.RowDefinitions>
+      <StackPanel Grid.Row="0" Margin="20">
+         <TextBlock Text="Focus the element to inspect with the propertyGrid." 
+                    TextWrapping="Wrap"/>
+      </StackPanel>
+
+      <!-- 
+      PropertyNameBinding will be used to determine the property name display text.
+      The value displayed will be specified through the DefaultEditorDefinition.
+      -->
+      <Grid Grid.Row="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition MinWidth="150" Width="*" />
+            <ColumnDefinition MaxWidth="530" Width="2.5*"/>
+         </Grid.ColumnDefinitions>
+         <StackPanel Grid.Column="0" >
+            <Button Content="Button" Margin="20" GotFocus="OnControlGetFocus" />
+            <TextBox Text="TextBox" Margin="20" GotFocus="OnControlGetFocus"/>
+            <CheckBox Content="CheckBox" Margin="20" GotFocus="OnControlGetFocus"/>
+         </StackPanel>
+            <!-- The SelectedObject property will be assigned in code-behind when one
+         of the 3 controls receives focus. -->
+         <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Column="1" HorizontalAlignment="Stretch" />
+      </Grid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
new file mode 100644
index 000000000..f7218c270
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml.cs
@@ -0,0 +1,36 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridSelectedObjectView.xaml
+  /// </summary>
+  public partial class PropertyGridSelectedObjectView : DemoView
+  {
+    public PropertyGridSelectedObjectView()
+    {
+      InitializeComponent();
+    }
+
+    private void OnControlGetFocus(object sender, System.Windows.RoutedEventArgs e)
+    {
+      _propertyGrid.SelectedObject = e.Source;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
new file mode 100644
index 000000000..2d91ab866
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
@@ -0,0 +1,51 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridSpecifyingPropertiesView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="PropertyGrid Specifying Properties">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Specifying Properties:" Style="{StaticResource Header}" Margin="10"/>
+      <xctk:PropertyGrid x:Name="_propertyGrid" 
+                         Grid.Row="1"
+                         Width="450" 
+                         MaxHeight="245"
+                         Margin="10"
+                         AutoGenerateProperties="False">
+         <xctk:PropertyGrid.PropertyDefinitions>
+            <!-- The following properties will be displayed in the PropertyGrid -->
+            <xctk:PropertyDefinition TargetProperties="FirstName,FavoriteColor,PetNames" />
+            <!-- And all properties of type Boolean -->
+            <xctk:PropertyDefinition TargetProperties="{x:Type s:Boolean}" />
+         </xctk:PropertyGrid.PropertyDefinitions>
+      </xctk:PropertyGrid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
new file mode 100644
index 000000000..2e6a381ab
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml.cs
@@ -0,0 +1,175 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridSpecifyingPropertiesView.xaml
+  /// </summary>
+  public partial class PropertyGridSpecifyingPropertiesView : DemoView
+  {
+    public PropertyGridSpecifyingPropertiesView()
+    {
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public System.DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public System.Windows.Media.Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new System.DateTime( 1975, 1, 23 );
+        person.Age = System.DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
+        {
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
new file mode 100644
index 000000000..6eabd4e70
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml
@@ -0,0 +1,100 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views.PropertyGridView"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:s="clr-namespace:System;assembly=mscorlib"
+                VerticalScrollBarVisibility="Disabled"
+                Title="PropertyGrid">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+         The PropertyGrid control allows you to view and edit the properties of a specific object instance, 
+           or values from a list of custom objects. This PropertyGrid allows you to autogenerate all properties 
+           or specify the specific properties you want to display. You can use the standard editors that are provided 
+           with the PropertyGrid or you can use custom editors that target a type, specific properties, or both.  
+           The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*"/>
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Show Sumary:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_showSummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
+
+            <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
+            <xctk:WatermarkTextBox x:Name="_filter" 
+                                   Grid.Row="1" 
+                                   Grid.Column="1"
+                                   Width="175"
+                                   Watermark="Search" 
+                                   VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid." />
+
+            <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" Margin="10,0,0,0"/>
+            <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid." />
+
+            <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2"  Margin="10,0,0,0"/>
+            <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
+            <TextBlock Text="IsReadOnly:" VerticalAlignment="Center" Grid.Row="2" Grid.Column="0" />
+            <CheckBox x:Name="_isReadOnly" Grid.Row="2" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ToolTip="Set the IsReadOnly property to true or false." />            
+         </Grid>
+      </GroupBox>
+
+      <DockPanel Grid.Row="1" Margin="10">
+
+         <TextBlock DockPanel.Dock="Top" Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock DockPanel.Dock="Top" 
+                    Text="Edit the values in the PropertyGrid to see the effect on the button."
+                    TextWrapping="Wrap" />
+         <Grid Margin="10">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="150"/>
+               <ColumnDefinition MaxWidth="530" />
+            </Grid.ColumnDefinitions>
+            <Button x:Name="_button" Height="100" Width="100" Margin="20" HorizontalAlignment="Center" VerticalAlignment="Center">Button</Button>
+
+            <xctk:PropertyGrid Grid.Column="1"
+                               x:Name="_propertyGrid"
+                               ShowSummary="{Binding IsChecked, ElementName=_showSummary}"
+                               Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
+                               IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
+                               ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}" 
+                               IsReadOnly="{Binding IsChecked, ElementName=_isReadOnly}"
+                               SelectedObject="{Binding ElementName=_button}">
+            </xctk:PropertyGrid>
+         </Grid>
+      </DockPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
new file mode 100644
index 000000000..100416b3a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridView.xaml.cs
@@ -0,0 +1,31 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
+{
+  /// <summary>
+  /// Interaction logic for PropertyGridView.xaml
+  /// </summary>
+  public partial class PropertyGridView : DemoView
+  {
+    public PropertyGridView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Resources/PencilTool16.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Images/PencilTool16.png
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Resources/PencilTool16.png
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
new file mode 100644
index 000000000..89dc867fa
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml
@@ -0,0 +1,120 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.AutoSelectTextboxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="AutoSelectTextBox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The AutoSelectTextBox allows the text content to be selected when the control get the focus. It also allows the Focus navigation behavior within the control to be affected.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <StackPanel>
+      <StackPanel.Resources>
+         <Style TargetType="{x:Type xctk:AutoSelectTextBox}">
+            <Setter Property="Margin" Value="5"/>
+            <Setter Property="AutoSelectBehavior" Value="{Binding SelectedItem, ElementName=_autoSelectBehavior}"/>
+            <Setter Property="AutoMoveFocus" Value="{Binding IsChecked, ElementName=_autoMoveFocus}"/>
+         </Style>
+      </StackPanel.Resources>
+
+      <!-- FEATURES GROUP BOX -->
+      <GroupBox Header="Features" >
+         <Grid Margin="5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto"/>
+               <ColumnDefinition Width="Auto"/>
+            </Grid.ColumnDefinitions>
+            <StackPanel Orientation="Horizontal" Grid.Column="0">
+               <TextBlock Grid.Row="0" Grid.Column="0" Text="AutoSelectBehavior: " VerticalAlignment="Center" />
+               <ComboBox Grid.Row="0" Grid.Column="1" x:Name="_autoSelectBehavior" SelectedIndex="1" Width="100" VerticalAlignment="Center">
+                  <x:StaticExtension Member="xctk:AutoSelectBehavior.Never" />
+                  <x:StaticExtension Member="xctk:AutoSelectBehavior.OnFocus" />
+               </ComboBox>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Grid.Column="1" Margin="10,0,0,0">
+               <TextBlock Grid.Row="0" Grid.Column="2" Text="AutoMoveFocus:  " VerticalAlignment="Center" />
+               <CheckBox Grid.Row="0" Grid.Column="3" x:Name="_autoMoveFocus" IsChecked="True" VerticalAlignment="Center"/>
+            </StackPanel>
+         </Grid>
+      </GroupBox>
+
+      <StackPanel>
+         <TextBlock Text="Usage:" Style="{StaticResource Header}"/>
+         <RichTextBox IsReadOnly="True" BorderThickness="0">
+            <FlowDocument>
+               <Paragraph>
+                  <Bold>AutoSelectBehavior:</Bold>
+                  <LineBreak/>
+                  The value of the "AutoSelectBehavior" property determines whether the content of the AutoSelectTextBox will be selected or not when the control gets the focus.
+                  <LineBreak/>
+                  <LineBreak/>
+                  <Bold>AutoMoveFocus:</Bold>
+                  <LineBreak/>
+                  <Italic>Effect with "MaxLength" property:</Italic>
+                  <LineBreak/>
+                  <LineBreak/>
+                  Setting the "MaxLength" of the text box allows the focus to move from the AutoSelectTextBox once the max length has been reached.
+               In the following "Telephone Number" fields, the "MaxLength" properties of the controls have been set to 3, 3, and 4.
+               </Paragraph>
+            </FlowDocument>
+         </RichTextBox>
+
+         <!-- PHONE NUMBER FIELDS -->         
+         <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+            <TextBlock Text="(" VerticalAlignment="Center"/>
+            <xctk:AutoSelectTextBox MaxLength="3" Width="30" Text="555"/>
+            <TextBlock Text=")" VerticalAlignment="Center"/>
+            <xctk:AutoSelectTextBox MaxLength="3" Width="30" Text="555"/>
+            <TextBlock Text="-" VerticalAlignment="Center"/>
+            <xctk:AutoSelectTextBox MaxLength="4" Width="40" Text="5555"/>
+         </StackPanel>
+         <RichTextBox IsReadOnly="True" BorderThickness="0">
+            <FlowDocument>
+               <Paragraph>
+                  <Italic>Effect with Arrow keys</Italic>
+                  <LineBreak/>
+                  <LineBreak/>
+                  Setting "AutoMoveFocus" to true also allows navigating the focus through the controls using the arrow keys to move the focus up, down, left, or right. 
+               You are no longer limited to the "left-right" navigation of the "Tab, Shift-Tab" keys.
+               </Paragraph>
+            </FlowDocument>
+         </RichTextBox>
+
+         <!-- TEXTBOX MATRIX -->
+         <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
+            <StackPanel Orientation="Horizontal">
+               <xctk:AutoSelectTextBox Text="Text1" Width="100" />
+               <xctk:AutoSelectTextBox Text="Text2" Width="100"/>
+               <xctk:AutoSelectTextBox Text="Text3" Width="100"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+               <xctk:AutoSelectTextBox Text="Text4" Width="100"/>
+               <xctk:AutoSelectTextBox Text="Text5" Width="100"/>
+               <xctk:AutoSelectTextBox Text="Text6" Width="100"/>
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+               <xctk:AutoSelectTextBox Text="Text7" Width="100"/>
+               <xctk:AutoSelectTextBox Text="Text8" Width="100"/>
+               <xctk:AutoSelectTextBox Text="Text9" Width="100"/>
+            </StackPanel>
+         </StackPanel>
+      </StackPanel>
+   </StackPanel>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
new file mode 100644
index 000000000..44ad7d20f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/AutoSelectTextboxView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for AutoSelectTextboxView.xaml
+  /// </summary>
+  public partial class AutoSelectTextboxView : DemoView
+  {
+    public AutoSelectTextboxView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
new file mode 100644
index 000000000..3120d1d2b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml
@@ -0,0 +1,90 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.MaskedTextboxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:s="clr-namespace:System;assembly=mscorlib"
+                 Title="MaskedTextBox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The MaskedTextBox control lets you display and edit values based on a mask.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <StackPanel Margin="5">
+            <Grid>
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Text="Include literals:" VerticalAlignment="Center" Margin="2" />
+               <CheckBox x:Name="_literals" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
+                         IsChecked="{Binding IncludeLiteralsInValue, ElementName=_maskedTextBox, Mode=TwoWay}"/>
+
+               <TextBlock Text="Include prompt:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+               <CheckBox x:Name="_prompt" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
+                         IsChecked="{Binding IncludePromptInValue, ElementName=_maskedTextBox, Mode=TwoWay}"/>
+            </Grid>
+            <Grid Margin="0,5,0,0">
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Text="Mask:" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_mask" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
+                        Text="{Binding Mask, ElementName=_maskedTextBox, ValidatesOnExceptions=True}" />
+
+               <TextBlock Text="Value:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_value" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center" Margin="5"
+                        Text="{Binding Value, ElementName=_maskedTextBox, ValidatesOnExceptions=True}"  />
+
+               <TextBlock Text="Text:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
+               <TextBox x:Name="_text" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" 
+                        Text="{Binding Text, ElementName=_maskedTextBox, ValidatesOnExceptions=True}"/>
+            </Grid>
+         </StackPanel>
+      </GroupBox>
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <xctk:MaskedTextBox x:Name="_maskedTextBox"
+                             Mask="(000) 000-0000"
+                             ValueDataType="{x:Type s:String}" />
+
+      </StackPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
new file mode 100644
index 000000000..e82ad5439
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MaskedTextboxView.xaml.cs
@@ -0,0 +1,35 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for MaskedTextboxView.xaml
+  /// </summary>
+  public partial class MaskedTextboxView : DemoView
+  {
+    public MaskedTextboxView()
+    {
+      InitializeComponent();
+      _mask.TextChanged += new System.Windows.Controls.TextChangedEventHandler( _mask_TextChanged );
+    }
+
+    void _mask_TextChanged( object sender, System.Windows.Controls.TextChangedEventArgs e )
+    {
+      _maskedTextBox.Value = null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
new file mode 100644
index 000000000..218cd233a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml
@@ -0,0 +1,61 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.MultiLineTextEditorView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="MultiLineTextEditor">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The MultiLineTextEditor is a TextBox that allows you to edit text that is too long to display in a regular TextBox. The popup is resizable to accommodate any text.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+        <DataTemplate x:Key="multiLineTextEditorStyle" >
+            <xctk:MultiLineTextEditor
+               TextWrapping="Wrap" 
+               Text="{Binding Path=Review}" 
+               Content="{Binding Text, RelativeSource={RelativeSource Self}}" 
+               HorizontalContentAlignment="Left" 
+               VerticalContentAlignment="Center"
+               Height="24" />
+        </DataTemplate>
+    </local:DemoView.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <StackPanel Grid.Row="1" Margin="10">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <DataGrid x:Name="_dataGrid" ItemsSource="{Binding}" AutoGenerateColumns="False" CanUserAddRows="False">
+                <DataGrid.Columns>
+                    <DataGridTextColumn Header="Title" Binding="{Binding Path=Title}" IsReadOnly="True"/>
+                    <DataGridTemplateColumn Header="Review" Width="150" CellTemplate ="{StaticResource multiLineTextEditorStyle}"/>
+                    <DataGridTextColumn Header="Rating" Binding="{Binding Path=Rating}" IsReadOnly="True"/>
+                </DataGrid.Columns>
+            </DataGrid>
+         </StackPanel>
+    </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
new file mode 100644
index 000000000..ac0093655
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/MultiLineTextEditorView.xaml.cs
@@ -0,0 +1,84 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
+{
+  public class Movie
+  {
+    public string Title
+    {
+      get;
+      set;
+    }
+
+    public string Review
+    {
+      get;
+      set;
+    }
+
+    public double Rating
+    {
+      get;
+      set;
+    }
+  }
+
+  /// <summary>
+  /// Interaction logic for MultiLineTextEditor.xaml
+  /// </summary>
+  public partial class MultiLineTextEditorView : DemoView
+  {
+    public MultiLineTextEditorView()
+    {
+      InitializeComponent();
+      _dataGrid.DataContext = InitMovieList();
+    }
+
+    private List<Movie> InitMovieList()
+    {
+      List<Movie> movieList = new List<Movie>();
+      movieList.Add( new Movie()
+      {
+        Title = "Lord Of The Rings",
+        Review = "A great movie with many special effects.",
+        Rating = 9
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Pirates Of The Caribbean",
+        Review = "An epic pirate movie with ships, swords, explosions, and a treasure.",
+        Rating = 9.5
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Batman",
+        Review = "Batman returns after 8 years, stronger than ever, to deliver Gotham City from a new criminal.",
+        Rating = 7.8
+      } );
+      movieList.Add( new Movie()
+      {
+        Title = "Indiana Jones",
+        Review = "Harrison Ford strikes back for an action-packed movie in the jungle to find a mysterious Crystal skull.",
+        Rating = 6.4
+      } );
+
+      return movieList;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
new file mode 100644
index 000000000..48f464984
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml
@@ -0,0 +1,73 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.RichTextboxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:rich="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views"
+                 Title="RichTextBox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The RichTextBox is a TextBox that allows you to edit formatted text based on TextFormatters. The RichTextBoxFormatBar is a contextual formatting toolbar that mimics the behavior of the Microsoft Office 2010 formatting bar on selection.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <GroupBox Header="Features" Grid.Row="0" Margin="5">
+            <Grid Margin="5" HorizontalAlignment="Left">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+                <TextBlock Text="TextFormatter:" VerticalAlignment="Center" />
+                <ComboBox x:Name="_textFormatter" SelectedIndex="0" SelectionChanged="OnTextFormatterChanged" Grid.Column="1" Width="150" Margin="5" HorizontalAlignment="Left">
+                    <ComboBoxItem Tag="{x:Static rich:TextFormatterEnum.PlainText}">Plain Text</ComboBoxItem>
+                    <ComboBoxItem Tag="{x:Static rich:TextFormatterEnum.Rtf}">RTF</ComboBoxItem>
+                    <ComboBoxItem Tag="{x:Static rich:TextFormatterEnum.Xaml}">Xaml</ComboBoxItem>
+                </ComboBox>
+                <TextBlock Text="Text:" Grid.Row="1" VerticalAlignment="Center"/>
+                <TextBox x:Name="_text" Grid.Row="1" Grid.Column="1" TextWrapping="Wrap" IsReadOnly="True" Width="500" Height="70" Margin="5" ScrollViewer.VerticalScrollBarVisibility="Auto"
+                         Text="{Binding ElementName=_richTextBox, Path=Text, Mode=OneWay}"/>
+             </Grid>
+        </GroupBox>
+
+        <StackPanel Grid.Row="1" Margin="10">
+            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+            <xctk:RichTextBox x:Name="_richTextBox" Grid.Column="1" Margin="5" BorderBrush="Gray" Padding="10" Width="350" >
+               <xctk:RichTextBoxFormatBarManager.FormatBar>
+                    <xctk:RichTextBoxFormatBar />
+                </xctk:RichTextBoxFormatBarManager.FormatBar>
+            <xctk:RichTextBox.Document>
+               <FlowDocument>
+                  <Paragraph>This is the <Bold>RichTextBox</Bold> !</Paragraph>
+               </FlowDocument>
+            </xctk:RichTextBox.Document>
+         </xctk:RichTextBox>
+        </StackPanel>
+    </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
new file mode 100644
index 000000000..6d9d1a565
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/RichTextboxView.xaml.cs
@@ -0,0 +1,69 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System;
+using System.Windows.Resources;
+using System.Windows;
+using System.IO;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
+{
+  public enum TextFormatterEnum
+  {
+    PlainText,
+    Rtf,
+    Xaml
+  };
+
+  /// <summary>
+  /// Interaction logic for RichTextboxView.xaml
+  /// </summary>
+  public partial class RichTextboxView : DemoView
+  {
+    public RichTextboxView()
+    {
+      InitializeComponent();
+      this.UpdateFormatter();
+    }
+
+    private void OnTextFormatterChanged( object sender, SelectionChangedEventArgs args )
+    {
+      this.UpdateFormatter();
+    }
+
+    private void UpdateFormatter()
+    {
+      if( ( _textFormatter != null ) && ( _text != null ) && ( _richTextBox != null ) )
+      {
+        object tagValue = ( ( ComboBoxItem )_textFormatter.SelectedItem ).Tag;
+        if( object.Equals( TextFormatterEnum.PlainText, tagValue ) )
+        {
+          _richTextBox.TextFormatter = new PlainTextFormatter();
+        }
+        else if( object.Equals( TextFormatterEnum.Rtf, tagValue ) )
+        {
+          _richTextBox.TextFormatter = new RtfFormatter();
+        }
+        else if( object.Equals( TextFormatterEnum.Xaml, tagValue ) )
+        {
+          _richTextBox.TextFormatter = new XamlFormatter();
+        }
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
new file mode 100644
index 000000000..4f35fc834
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml
@@ -0,0 +1,66 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views.WatermarkTextboxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="WatermarkTextBox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0">
+         <Grid Margin="5">
+            <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Default:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" />
+
+         <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <xctk:WatermarkTextBox.Watermark>
+               <StackPanel Orientation="Horizontal">
+                  <Image Source="..\Resources\PencilTool16.png" Stretch="None" />
+                  <TextBlock Text="Enter Text" Margin="4,0,0,0" />
+               </StackPanel>
+            </xctk:WatermarkTextBox.Watermark>
+         </xctk:WatermarkTextBox>
+
+         <TextBlock Grid.Row="1" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
+         <xctk:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <xctk:WatermarkTextBox.WatermarkTemplate>
+               <DataTemplate>
+                  <Border BorderBrush="Green" BorderThickness="1" Padding="5">
+                     <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
+                  </Border>
+               </DataTemplate>
+            </xctk:WatermarkTextBox.WatermarkTemplate>
+         </xctk:WatermarkTextBox>
+      </StackPanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
new file mode 100644
index 000000000..075b2045f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Text/Views/WatermarkTextboxView.xaml.cs
@@ -0,0 +1,30 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************/
+
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
+{
+  /// <summary>
+  /// Interaction logic for WatermarkTextboxView.xaml
+  /// </summary>
+  public partial class WatermarkTextboxView : DemoView
+  {
+    public WatermarkTextboxView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
new file mode 100644
index 000000000..6492db129
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Converters/FlagPathConverter.cs
@@ -0,0 +1,28 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Converters
+{
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPicture.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPicture.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPicture.png
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPicture.png
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureA.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureA.jpg
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureA.jpg
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureA.jpg
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureB.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureB.jpg
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureB.jpg
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureB.jpg
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureC.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureC.jpg
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureC.jpg
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureC.jpg
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureD.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureD.jpg
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/NoPictureD.jpg
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/NoPictureD.jpg
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/Working.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/Working.png
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Themes/Images/Working.png
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Images/Working.png
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/CoreWPFControls.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/CoreWPFControls.png
new file mode 100644
index 000000000..aebe1d4d7
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/CoreWPFControls.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/DataGridControls.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/DataGridControls.png
new file mode 100644
index 000000000..5e2c3575b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/DataGridControls.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ExtendedWPFToolkitControls.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ExtendedWPFToolkitControls.png
new file mode 100644
index 000000000..dce595f58
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ExtendedWPFToolkitControls.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ListBoxControls.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ListBoxControls.png
new file mode 100644
index 000000000..a9b3780c4
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/OpenSourceImages/ListBoxControls.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
new file mode 100644
index 000000000..b6ead7dde
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml
@@ -0,0 +1,62 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingCoreWPFView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views"
+                 Title="Theming Core WPF Controls">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Changes the themes of the WPF controls. The Xceed.Wpf.Themes.Office2007.dll and Xceed.Wpf.Themes.dll assemblies are necessary to use the themes.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\CoreWPFControls.png" Width="700" Height="500"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs
new file mode 100644
index 000000000..d3b456fe3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingCoreWPFView.xaml.cs
@@ -0,0 +1,71 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System.Windows.Controls.Primitives;
+using System;
+using System.Data;
+using Xceed.Wpf.DataGrid.Views;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
+{
+  /// <summary>
+  /// Interaction logic for ThemingCoreWPFView.xaml
+  /// </summary>
+  public partial class ThemingCoreWPFView : DemoView
+  {
+
+
+
+
+
+
+    #region Constructors
+
+    public ThemingCoreWPFView()
+    {
+      InitializeComponent();
+    }
+
+    #endregion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
new file mode 100644
index 000000000..cbf0893a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml
@@ -0,0 +1,71 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingDataGridView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Converters"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="Theming WPF DataGrid"
+                 x:Name="_demo">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Changes the themes of the datagrid control. The Xceed.Wpf.DataGrid.Themes.Office2007.dll assembly is necessary to use the themes on the datagrid.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\DataGridControls.png" Width="700" Height="500"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs
new file mode 100644
index 000000000..144cf8665
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingDataGridView.xaml.cs
@@ -0,0 +1,42 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System.Windows.Controls.Primitives;
+using System;
+using Xceed.Wpf.Samples.SampleData;
+using System.Data;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
+{
+  /// <summary>
+  /// Interaction logic for ThemingDataGridView.xaml
+  /// </summary>
+  public partial class ThemingDataGridView : DemoView
+  {
+    public ThemingDataGridView()
+    {
+      InitializeComponent();
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
new file mode 100644
index 000000000..cba13a412
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml
@@ -0,0 +1,58 @@
+﻿<!--***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingExtendedToolkitView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:xcdg="http://schemas.xceed.com/wpf/xaml/datagrid"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="Theming WPF Extended Toolkit"
+                 x:Name="_demo">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Changes the themes of the Extended WPF Toolkit controls. The Xceed.Wpf.Toolkit.Themes.Office2007.dll assembly is necessary to use the themes.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ExtendedWPFToolkitControls.png" Width="700" Height="500"/>
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
new file mode 100644
index 000000000..3adae6b45
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingExtendedToolkitView.xaml.cs
@@ -0,0 +1,39 @@
+﻿/****************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Diagnostics;
+using System.Windows;
+using System;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
+{
+  /// <summary>
+  /// Interaction logic for ThemingExtendedToolkitView.xaml
+  /// </summary>
+  public partial class ThemingExtendedToolkitView : DemoView
+  {
+    public ThemingExtendedToolkitView()
+    {
+      InitializeComponent();
+    }
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
new file mode 100644
index 000000000..1d0a184a5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml
@@ -0,0 +1,57 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views.ThemingListBoxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:xclb="http://schemas.xceed.com/wpf/xaml/listbox"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views"
+                 VerticalScrollBarVisibility="Disabled"
+                 Title="Theming ListBox"
+                 x:Name="_demo">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>Dress Up Your App in Style in Minutes</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>Supports implicit styles, so the entire listbox can be styled in minutes with a couple of lines of code. Also supports explicit styles and Expression Blend.</Run>
+            <LineBreak />
+            <Run>This feature is only available in the "Plus" version.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    <Image Source="..\OpenSourceImages\ListBoxControls.png" Width="700" Height="500"/>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
new file mode 100644
index 000000000..cf28c380c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Theming/Views/ThemingListBoxView.xaml.cs
@@ -0,0 +1,77 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System.Windows.Controls.Primitives;
+using System;
+using Xceed.Wpf.Samples.SampleData;
+using System.Data;
+using System.Diagnostics;
+using System.Windows.Media;
+using System.Windows.Threading;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
+{
+
+  /// <summary>
+  /// Interaction logic for ThemingListBoxView.xaml
+  /// </summary>
+  public partial class ThemingListBoxView : DemoView
+  {
+
+
+
+    #region Initialization
+
+    public ThemingListBoxView()
+    {
+      InitializeComponent();
+
+    }
+
+    #endregion
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
new file mode 100644
index 000000000..bf57400b8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml
@@ -0,0 +1,183 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimelinePanel.Views.TimelinePanelView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:pf="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 Title="TimelinePanel">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           TimelinePanel is a WPF panel at arranges it's children along a timeline.  Items are placed along the timeline based on the Date attached property, which is set on each item.
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <ObjectDataProvider x:Key="Orientations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="Orientation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="OverlapBehaviors" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:OverlapBehavior" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+
+      <ControlTemplate x:Key="TimelineItemTemplate"
+                       TargetType="ContentControl">
+         <xctk:DropDownButton DataContext="{Binding ., RelativeSource={RelativeSource TemplatedParent}}"
+                              Content="{TemplateBinding Content}">
+            <xctk:DropDownButton.ContentTemplate>
+               <DataTemplate>
+                  <TextBlock Text="{TemplateBinding Content}" 
+                             TextTrimming="WordEllipsis" 
+                             VerticalAlignment="Center" />
+               </DataTemplate>
+            </xctk:DropDownButton.ContentTemplate>
+
+            <xctk:DropDownButton.DropDownContent>
+               <Border Background="Lavender"
+                       Padding="5">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <TextBox Text="{Binding Content, Mode=TwoWay}"
+                           Grid.Row="0"
+                           Grid.Column="0"
+                           Grid.ColumnSpan="2"
+                           VerticalAlignment="Center"
+                           HorizontalContentAlignment="Center" />
+
+                     <TextBlock Text="From"
+                                Grid.Row="1"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.Date), Mode=TwoWay}"
+                                          Grid.Row="1"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+
+                     <TextBlock Text="To"
+                                Grid.Row="2"
+                                Grid.Column="0"
+                                VerticalAlignment="Center"
+                                Margin="0,0,5,0" />
+                     <xctk:DateTimePicker Value="{Binding (xctk:TimelinePanel.DateEnd), Mode=TwoWay}"
+                                          Grid.Row="2"
+                                          Grid.Column="1"
+                                          VerticalAlignment="Center"
+                                          Format="ShortDate" />
+                  </Grid>
+               </Border>
+            </xctk:DropDownButton.DropDownContent>
+         </xctk:DropDownButton>
+      </ControlTemplate>
+   </local:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid>
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Orientation:" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOrientation" Grid.Column="1" ItemsSource="{Binding Source={StaticResource Orientations}}" SelectedIndex="0" VerticalAlignment="Center" HorizontalAlignment="Left" Width="150" Margin="5" />
+
+            <TextBlock Text="Overlap behavior:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <ComboBox Name="_cboOverlap" Grid.Row="1" Grid.Column="1" ItemsSource="{Binding Source={StaticResource OverlapBehaviors}}" SelectedIndex="0" Width="150" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="5" />
+
+            <TextBlock Text="Keep original order:" Grid.Row="2" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_keepOrder" Grid.Row="2" Grid.Column="1" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+         </Grid>
+      </GroupBox>
+
+      <xctk:TimelinePanel x:Name="_panel"
+                          Grid.Row="1"
+                          Orientation="{Binding SelectedItem, ElementName=_cboOrientation}"
+                          OverlapBehavior="{Binding SelectedItem, ElementName=_cboOverlap}"
+                          KeepOriginalOrderForOverlap="{Binding IsChecked, ElementName=_keepOrder}">
+
+         <ContentControl xctk:TimelinePanel.Date="2012-01-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-01-16T00:00:00"
+                         Content="Event #1"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-02T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-02-26T00:00:00"
+                         Content="Event #2"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-14T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-14T00:00:00"
+                         Content="Event #3"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-02-21T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-03-10T00:00:00"
+                         Content="Event #4"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-05-17T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-06-23T00:00:00"
+                         Content="Event #5"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-06-06T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-08-13T00:00:00"
+                         Content="Event #6"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-08-13T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-09-29T00:00:00"
+                         Content="Event #7"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+         <ContentControl xctk:TimelinePanel.Date="2012-11-01T00:00:00"
+                         xctk:TimelinePanel.DateEnd="2012-12-01T00:00:00"
+                         Content="Event #8"
+                         Template="{StaticResource TimelineItemTemplate}" />
+
+      </xctk:TimelinePanel>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
new file mode 100644
index 000000000..081281bff
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/TimelinePanel/Views/TimelinePanelView.xaml.cs
@@ -0,0 +1,29 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************/
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimelinePanel.Views
+{
+  /// <summary>
+  /// Interaction logic for TimelinePanelView.xaml
+  /// </summary>
+  public partial class TimelinePanelView : DemoView
+  {
+    public TimelinePanelView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
new file mode 100644
index 000000000..ace26a91e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/IntToBoolConverter.cs
@@ -0,0 +1,42 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
+{
+  class IntToBoolConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      int intReceived = (int)value;
+
+      if( intReceived == 1 )
+        return false;
+      else
+        return true;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
new file mode 100644
index 000000000..b0e854e40
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Converters/WindowStateToBoolConverter.cs
@@ -0,0 +1,38 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using Xceed.Wpf.Toolkit;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
+{
+  public class WindowStateToBoolConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return ((WindowState)value == WindowState.Open);
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return (bool)value ? WindowState.Open : WindowState.Closed;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
new file mode 100644
index 000000000..5325e6595
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
@@ -0,0 +1,189 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!--This file contains some "fancy" styles used by the StylableWindow sample. They are placed 
+   here to avoid cluttering the XAML view of the sample. -->
+
+   <LinearGradientBrush x:Key="FancyButtonRegionBackground" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+                <GradientStop Color="Peru" Offset="0" />
+                <GradientStop Color="SaddleBrown" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+                <GradientStop Color="Chocolate" Offset="0" />
+                <GradientStop Color="SaddleBrown" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+                <GradientStop Color="Chocolate" Offset="0" />
+                <GradientStop Color="Maroon" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="FancyButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FFFFFFFF" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Width" Value="30" />
+      <Setter Property="Height" Value="20" />
+      <Setter Property="Margin" Value="2,-1,2,0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource FancyButtonRegionBackground}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter TargetName="contentPresenter" Property="Opacity" Value="0.5" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+    <Geometry x:Key="closeGeometry">
+        M0,0 L6,0 6,6 0,6 z
+    </Geometry>
+    <Geometry x:Key="minimizeGeometry">
+        M0,0 L4,4 8,0 z
+    </Geometry>
+    <Geometry x:Key="maximizeGeometry">
+        M0,5 L5,0 10,5 z
+    </Geometry>
+    <Geometry x:Key="restoreGeometry">
+        M0,0 L4,4 3,5 0,5 4,9 5,9 9,5 6,5 5,4 9,0 z
+    </Geometry>
+
+    <Style x:Key="FancyButtonCloseStyle" TargetType="Button" BasedOn="{StaticResource FancyButtonStyle}">
+      <Setter Property="ToolTip" Value="Close" />
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+                <Path Height="7"
+                   SnapsToDevicePixels="False"
+                   RenderOptions.EdgeMode="Aliased"
+                   HorizontalAlignment="Center"
+                   VerticalAlignment="Center"
+                   Width="7"
+                   Fill="#FFFF6400"
+                   Stretch="None"
+                   Stroke="#FFFF6400" 
+                   StrokeThickness="1"
+                   Data="{StaticResource closeGeometry}" />
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="FancyButtonMaximizeStyle" TargetType="Button" BasedOn="{StaticResource FancyButtonStyle}">
+      <Setter Property="ToolTip" Value="Maximize" />
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+                  <Path Height="6"
+                     SnapsToDevicePixels="False"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Center"
+                     Width="11"
+                     Fill="LightGreen"
+                     Stretch="None"
+                     Stroke="Transparent" 
+                     StrokeThickness="1"
+                     Data="{StaticResource maximizeGeometry}" />
+               </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+    <Style x:Key="FancyButtonMinimizeStyle" TargetType="Button" BasedOn="{StaticResource FancyButtonStyle}">
+      <Setter Property="ToolTip" Value="Minimize" />
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+                  <Path Height="5"
+                     SnapsToDevicePixels="False"
+                     HorizontalAlignment="Center"
+                     VerticalAlignment="Bottom"
+                     Width="9"
+                     Fill="Yellow"
+                     Stretch="None"
+                     Stroke="Yellow"
+                     StrokeThickness="1"
+                     Data="{StaticResource minimizeGeometry}" />
+               </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+    <Style x:Key="FancyButtonRestoreStyle" TargetType="Button" BasedOn="{StaticResource FancyButtonStyle}">
+        <Setter Property="ToolTip" Value="Restore Down" />
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <Path Height="10"
+                        SnapsToDevicePixels="False"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        Width="10"
+                        Fill="LightGreen"
+                        Stretch="None"
+                        Stroke="LightGreen" 
+                        Data="{StaticResource restoreGeometry}" />
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
new file mode 100644
index 000000000..426f30253
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml
@@ -0,0 +1,103 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<UserControl x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+             xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+             xmlns:sys="clr-namespace:System;assembly=mscorlib"
+             mc:Ignorable="d" 
+             d:DesignHeight="300" d:DesignWidth="300" 
+             x:Name="_windowModelEditor">
+   <UserControl.Resources>
+      <conv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter"/>
+      <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
+      <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+
+      <Style x:Key="disabledTextBlockStyle" TargetType="TextBlock">
+         <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="False">
+               <Setter Property="Foreground" Value="Gray"/>
+            </Trigger>
+         </Style.Triggers>
+      </Style>
+
+      <ObjectDataProvider x:Key="WindowStyleComboBoxItemsSource" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="WindowStyle" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+
+   </UserControl.Resources>
+   <StackPanel>
+      <StackPanel.Resources>
+         <Style TargetType="TextBlock">
+            <Setter Property="DockPanel.Dock" Value="Left"/>
+         </Style>
+      </StackPanel.Resources>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowBackground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}"/>
+         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+            SelectedColor="{Binding WindowBackground, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" Margin="5,0,0,0"/>
+      </DockPanel>
+       <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowInactiveBackground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}"/>
+         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+            SelectedColor="{Binding WindowInactiveBackground, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="62" Margin="5,0,0,0"/>
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowBorderBrush:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}" />
+         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                           SelectedColor="{Binding WindowBorderBrush, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" Margin="5,0,0,0"/>
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowBorderThickness:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}" />
+         <xctk:IntegerUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                             Value="{Binding WindowBorderThickness, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}" Minimum="0" Maximum="75" ClipValueToMinMax="True" Margin="5,0,0,0" />
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowOpacity:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}" />
+         <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                            Value="{Binding WindowOpacity}" Minimum="0" Maximum="1" Increment="0.1" FormatString="N1" ClipValueToMinMax="True" Margin="5,0,0,0"/>
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="TitleForeground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}" />
+         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                           SelectedColor="{Binding TitleForeground, Converter={StaticResource SolidColorBrushToColorConverter}}" Margin="5,0,0,0"/>
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="TitleShadowBrush:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource disabledTextBlockStyle}" />
+         <xctk:ColorPicker x:Name="_titleShadowBrushColorPicker" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                           SelectedColor="{Binding TitleShadowBrush, Converter={StaticResource SolidColorBrushToColorConverter}}" Margin="5,0,0,0"/>
+      </DockPanel>
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="WindowStyle:" VerticalAlignment="Center" Style="{StaticResource disabledTextBlockStyle}" />
+         <ComboBox ItemsSource="{Binding Source={StaticResource WindowStyleComboBoxItemsSource}}" SelectedItem="{Binding WindowStyle}" Width="140" Margin="5,0,0,0"/>
+      </DockPanel>      
+      <DockPanel Margin="0,5,0,5">
+         <TextBlock Text="CloseButtonVisibility:" 
+                    VerticalAlignment="Center" 
+                    Style="{StaticResource disabledTextBlockStyle}"
+                    ToolTip="Not applicable for MessageBoxes."/> <!-- #TODODOC -->
+         <CheckBox IsChecked="{Binding CloseButtonVisibility, Converter={StaticResource VisibilityToBoolConverter}}" 
+                   Margin="5,0,0,0"
+                   VerticalAlignment="Center"
+                   ToolTip="Not applicable for MessageBoxes."/> <!-- #TODODOC -->
+      </DockPanel>
+   </StackPanel>
+</UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
new file mode 100644
index 000000000..76cb53965
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
@@ -0,0 +1,66 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using Xceed.Wpf.Toolkit;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources
+{
+  /// <summary>
+  /// Interaction logic for WindowModelEditor.xaml
+  /// </summary>
+  public partial class WindowModelEditor : UserControl
+  {
+    public WindowModelEditor()
+    {
+      InitializeComponent();
+
+      ObservableCollection<ColorItem> alphaAvailableColors = new ObservableCollection<ColorItem>();
+      foreach( ColorItem item in _titleShadowBrushColorPicker.AvailableColors )
+      {
+        System.Windows.Media.Color color = System.Windows.Media.Color.FromArgb( ( byte )100, item.Color.R, item.Color.G, item.Color.B );
+        alphaAvailableColors.Add( new ColorItem( color, item.Name ) );
+      }
+      _titleShadowBrushColorPicker.AvailableColors = alphaAvailableColors;
+    }
+
+    #region IsStyleEnabled
+
+    public static readonly DependencyProperty IsStyleEnabledProperty =
+        DependencyProperty.Register( "IsStyleEnabled", typeof( bool ), typeof( WindowModelEditor ), new UIPropertyMetadata( false ) );
+
+    public bool IsStyleEnabled
+    {
+      get { return ( bool )GetValue( IsStyleEnabledProperty ); }
+      set { SetValue( IsStyleEnabledProperty, value ); }
+    }
+
+    #endregion //IsStyleEnabled
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/xceed_icon.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/xceed_icon.png
new file mode 100644
index 000000000..f44fd9d0a
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/xceed_icon.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
new file mode 100644
index 000000000..c6096a072
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml
@@ -0,0 +1,146 @@
+﻿<!--****************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.ChildWindowView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                 xmlns:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                 Title="ChildWindow">
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+            <Run>The ChildWindow control can be used to create a window that is displayed within the bounds of a specific parent container.</Run>
+            <LineBreak />
+            <LineBreak />
+            <Run>In addition to the following features, the "Plus" version allows ChildWindow to be resizable and to use a Maximize/Restore button.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+        </Paragraph>
+    </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <conv:IntToBoolConverter x:Key="IntToBoolConverter" />
+      <xctkconv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter" Inverted="True"/>
+
+      <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:WindowState" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="WindowStartupLocations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="xctk:WindowStartupLocation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+   </local:DemoView.Resources>
+
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Caption:" Margin="2" VerticalAlignment="Center" />
+            <TextBox Name="_txtCaption" Grid.Column="1" Margin="5" Text="ChildWindow" Width="150" VerticalAlignment="Center" />
+
+            <TextBlock Grid.Row="1" Name="textBlock2" Text="Left:" Margin="2" VerticalAlignment="Center" />
+            <xctk:DoubleUpDown x:Name="_txtLeft" Grid.Column="1" Grid.Row="1" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
+
+            <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" />
+            <xctk:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" Minimum="0" VerticalAlignment="Center" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowStartupLocations}"/>
+
+            <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="10,2,2,2" Grid.Column="2" />
+            <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+
+            <TextBlock Grid.Row="1" Text="WindowStartupLocation:" VerticalAlignment="Center" Margin="10,2,2,2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="1" Name="_cboWindowStartupLocations" ItemsSource="{Binding Source={StaticResource WindowStartupLocations}}" SelectedIndex="1" VerticalAlignment="Center" Width="70" Margin="5" IsEnabled="{Binding SelectedIndex, ElementName=_cboWindowState, Converter={StaticResource IntToBoolConverter}}"/>
+
+            <TextBlock Grid.Row="2" Text="WindowState:" VerticalAlignment="Center" Margin="10,2,2,2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="2" Name="_cboWindowState" ItemsSource="{Binding Source={StaticResource WindowStates}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" />
+         </Grid>
+      </GroupBox>
+
+      <Grid Grid.Row="1" Margin="10">
+        <xctk:WindowContainer Background="Transparent" ModalBackgroundBrush="LightGray">
+            <xctk:ChildWindow x:Name="_childWindow"
+                           Width="350"
+                           Height="220"
+                           Caption="{Binding Text, ElementName=_txtCaption}"
+                           IsModal="{Binding IsChecked, ElementName=_chkIsModal}"
+                           Left="{Binding Value, ElementName=_txtLeft, Mode=TwoWay}"
+                           Top="{Binding Value, ElementName=_txtTop, Mode=TwoWay}"
+                           WindowStartupLocation="{Binding SelectedItem, ElementName=_cboWindowStartupLocations}" 
+                           WindowState="{Binding SelectedItem, ElementName=_cboWindowState}">
+            <Grid Margin="10" >
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+               <xctk:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+               <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+               <xctk:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+               <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+               <xctk:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+               <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+               <xctk:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+               <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+               <xctk:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+               <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+                  <Button Width="65" Margin="2">OK</Button>
+                  <Button Width="65" Margin="2">Cancel</Button>
+               </StackPanel>
+            </Grid>
+         </xctk:ChildWindow>
+        </xctk:WindowContainer>
+      </Grid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
new file mode 100644
index 000000000..4d8b0dc2f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/ChildWindowView.xaml.cs
@@ -0,0 +1,33 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System.Diagnostics;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
+{
+  /// <summary>
+  /// Interaction logic for ChildWindowView.xaml
+  /// </summary>
+  public partial class ChildWindowView : DemoView
+  {
+    public ChildWindowView()
+    {
+      InitializeComponent();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml
new file mode 100644
index 000000000..a5e0715d1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml
@@ -0,0 +1,169 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.StylableWindowView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                 xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="StylableWindows" >
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+         <Run>It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled.</Run>
+         <LineBreak />
+         <LineBreak />
+         <Run>The "Plus" version provides a new control called StylableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
+            <LineBreak />
+            <Hyperlink NavigateUri="http://www.xceed.com/Extended_WPF_Toolkit_Intro.html" RequestNavigate="Hyperlink_RequestNavigate">
+               Click here for more details about Xceed Extended WPF Toolkit Plus.
+            </Hyperlink>
+
+      </Paragraph>
+   </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples/Window/Resources/FancyStyles.xaml"/>
+         </ResourceDictionary.MergedDictionaries>
+
+         <conv:WindowStateToBoolConverter x:Key="windowStateBoolConv" />
+
+         <!--Base style for ChildWindowStyle and MessageBoxStyle-->
+         <Style x:Key="windowControlStyle" TargetType="{x:Type xctk:WindowControl}">
+            <Setter Property="WindowBackground" Value="{Binding WindowBackground}" />
+            <Setter Property="WindowBorderBrush" Value="{Binding WindowBorderBrush}" />
+            <Setter Property="WindowBorderThickness" Value="{Binding WindowBorderThickness}" />
+            <Setter Property="WindowInactiveBackground" Value="{Binding WindowInactiveBackground}" />
+            <Setter Property="WindowOpacity" Value="{Binding WindowOpacity}" />
+            <Setter Property="CaptionForeground" Value="{Binding TitleForeground}" />
+            <Setter Property="CaptionShadowBrush" Value="{Binding TitleShadowBrush}" />
+            <Setter Property="CloseButtonStyle" Value="{Binding CloseButtonStyle}" />
+         </Style>
+
+         <!--Style for the MessageBox-->
+         <Style x:Key="messageBoxStyle" TargetType="{x:Type xctk:MessageBox}" BasedOn="{StaticResource windowControlStyle}">
+            <Setter Property="ButtonRegionBackground" Value="{StaticResource FancyButtonRegionBackground}" />
+            <Setter Property="OkButtonStyle" Value="{StaticResource FancyButtonStyle}" />
+            <Setter Property="CancelButtonStyle" Value="{StaticResource FancyButtonStyle}" />
+            <Setter Property="YesButtonStyle" Value="{StaticResource FancyButtonStyle}" />
+            <Setter Property="NoButtonStyle" Value="{StaticResource FancyButtonStyle}" />
+         </Style>
+
+      </ResourceDictionary>
+   </local:DemoView.Resources>
+
+
+
+   <local:DemoView.DataContext>
+      <!--A model containing the brushes and other properties was created to share theses values
+      between ChildWindow, MessageBox, and StylableWindow.-->
+      <view:WindowModel
+         WindowBackground="#FFEFAC27"
+         WindowBorderBrush="Black"
+         WindowBorderThickness="2"
+         WindowInactiveBackground="LightGray"
+         WindowOpacity="0.75"
+         WindowStyle="SingleBorderWindow"
+         TitleForeground="Brown"
+         TitleShadowBrush="White"
+         ResizeMode="CanResize"
+         CloseButtonVisibility="Visible" 
+         CloseButtonStyle="{StaticResource FancyButtonCloseStyle}"
+         MinimizeButtonStyle="{StaticResource FancyButtonMinimizeStyle}"
+         MaximizeButtonStyle="{StaticResource FancyButtonMaximizeStyle}"
+         RestoreButtonStyle="{StaticResource FancyButtonRestoreStyle}"/>
+   </local:DemoView.DataContext>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
+      </StackPanel>
+
+      <Grid Grid.Row="1">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*"/>
+         </Grid.ColumnDefinitions>
+
+         <GroupBox Header="Features" Margin="5" VerticalAlignment="Stretch">
+            <StackPanel HorizontalAlignment="Center">
+               <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
+                  <TextBlock Text="Show ChildWindow:" VerticalAlignment="Center" Width="120"/>
+                  <CheckBox IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource windowStateBoolConv}}"
+                            Margin="5,0,0,0"
+                            VerticalAlignment="Center"/>
+               </StackPanel>
+               <StackPanel Orientation="Horizontal" Margin="0,5,0,25">
+                  <TextBlock Text="Enable Styling:" VerticalAlignment="Center" Width="120"/>
+                  <CheckBox x:Name="_enableStyleCheckBox" IsChecked="True" Margin="5,0,0,0" Click="UpdateWindowsStyles" />
+               </StackPanel>
+               <!--This is a custom control that modifies the underlying model. It is defined elsewhere to avoid cluttering this XAML. -->
+               <res:WindowModelEditor IsStyleEnabled="{Binding ElementName=_enableStyleCheckBox, Path=IsChecked}"/>
+            </StackPanel>
+         </GroupBox>
+
+         <DockPanel Grid.Column="1" Margin="5" >
+            <GroupBox Header="MessageBox" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch">
+               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                  <Button Content="Show System MessageBox" Click="StandardMessageBoxButton_Click" Width="150" Height="30" Margin="10"/>
+                  <Button Content="Show Toolkit MessageBox" Click="StyledMessageBoxButton_Click" Margin="10" Width="150" Height="30"/>
+               </StackPanel>
+            </GroupBox>
+            <GroupBox Header="Stylable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
+               <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
+                       Content="Show" Click="OnStylableWindow_Click" >
+                  <Button.ContentTemplate>
+                     <DataTemplate>
+                        <StackPanel Orientation="Horizontal">
+                           <TextBlock Text="{Binding}" />
+                           <TextBlock Text=" (Plus Only)" 
+                                Foreground="#06b025" 
+                                FontWeight="SemiBold" 
+                                FontStyle="Oblique" />
+                        </StackPanel>
+                     </DataTemplate>
+                  </Button.ContentTemplate>
+               </Button>
+            </GroupBox>
+            <GroupBox Header="ChildWindow" Margin="5">
+               <Border BorderThickness="1" 
+                        BorderBrush="Black" >
+                  <xctk:WindowContainer >
+                     <xctk:ChildWindow x:Name="_childWindow" Width="325" Height="100"
+                                    Caption="Extended WPF Toolkit ChildWindow"
+                                    WindowStartupLocation="Center"
+                                    IsModal="True"
+                                    WindowState="Open" 
+                                    CloseButtonVisibility="{Binding CloseButtonVisibility}"
+                                    WindowStyle="{Binding WindowStyle}" >
+                        <TextBlock>
+                           This is the content of the child window.
+                        </TextBlock>
+                     </xctk:ChildWindow>
+                  </xctk:WindowContainer>
+               </Border>
+            </GroupBox>
+         </DockPanel>
+      </Grid>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml.cs
new file mode 100644
index 000000000..e74dce188
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StylableWindowView.xaml.cs
@@ -0,0 +1,297 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+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;
+using Xceed.Wpf.Toolkit;
+using System.ComponentModel;
+using System.Diagnostics;
+using Xceed.Wpf.Toolkit.Primitives;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
+{
+  /// <summary>
+  /// Interaction logic for StylableWindowView.xaml
+  /// </summary>
+  public partial class StylableWindowView : DemoView
+  {
+    private const string StandardMsgBoxTitle = "Standard MessageBox";
+    private const string StyledMsgBoxTitle = "Extended WPF Toolkit styled MessageBox";
+    private const string StylableWindowTitle = "Extended WPF Toolkit StylableWindow";
+    private const string StandardMsgBoxMessage = "The standard system MessageBox will always have this look. No styling is possible.";
+    private const string StyledMsgBoxMessage = "The Toolkit MessageBox allows you to style it in order to integrate it into your application colors and styles.";
+    private const string StylableWindowContent = "This is a StylableWindow that has the same functionality as a normal window.";
+    private const string MessageBoxStyleKey = "messageBoxStyle";
+    private const string WindowControlStyleKey = "windowControlStyle";
+    private const string WindowButtonStyle = "FancyButtonStyle";
+    private const string StylableWindowMessage = "StylableWindow is a standalone window that can be styled just like ChildWindow or MessageBox. This is a feature of the \"Plus\" version.";
+
+    public StylableWindowView()
+    {
+      InitializeComponent();
+      this.UpdateWindowsStyles(null,null);
+    }
+
+
+    private void OnStylableWindow_Click( object sender, RoutedEventArgs e )
+    {
+      var msgBox = new Xceed.Wpf.Toolkit.MessageBox();
+      msgBox.DataContext = this.DataContext;
+      msgBox.Text = StylableWindowMessage;
+      msgBox.Caption = StyledMsgBoxTitle;
+      msgBox.Style = ( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) ? ( Style )this.Resources[ MessageBoxStyleKey ] : null;
+      msgBox.ShowDialog();
+
+
+
+    }
+
+    private void StandardMessageBoxButton_Click( object sender, RoutedEventArgs e )
+    {
+      System.Windows.MessageBox.Show( StandardMsgBoxMessage, StandardMsgBoxTitle );
+    }
+
+    private void StyledMessageBoxButton_Click( object sender, RoutedEventArgs e )
+    {
+      var msgBox = new Xceed.Wpf.Toolkit.MessageBox();
+      msgBox.DataContext = this.DataContext;
+      msgBox.Text = StyledMsgBoxMessage;
+      msgBox.Caption = StyledMsgBoxTitle;
+      if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) 
+      {
+        msgBox.Style = ( Style )this.Resources[ MessageBoxStyleKey ];
+      }
+      msgBox.ShowDialog();
+    }
+
+    private void UpdateWindowsStyles( object sender, RoutedEventArgs e )
+    {
+      bool styled = _enableStyleCheckBox.IsChecked.GetValueOrDefault();
+      if( styled )
+      {
+        _childWindow.Style = ( Style )this.Resources[ WindowControlStyleKey ];
+      }
+      else
+      {
+        _childWindow.ClearValue( ChildWindow.StyleProperty );
+      }
+
+    }
+  }
+
+  /// <summary>
+  /// This model will allow to share the style values between our MessageBox, 
+  /// ChildWindow and StylableWindow controls
+  /// </summary>
+  public class WindowModel : DependencyObject
+  {
+
+    #region WindowBackground
+
+    public static readonly DependencyProperty WindowBackgroundProperty =
+        DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowModel ), new UIPropertyMetadata( null ) );
+
+    public Brush WindowBackground
+    {
+      get { return ( Brush )GetValue( WindowBackgroundProperty ); }
+      set { SetValue( WindowBackgroundProperty, value ); }
+    }
+
+    #endregion //WindowBackground
+
+    #region WindowInactiveBackground
+
+    public static readonly DependencyProperty WindowInactiveBackgroundProperty =
+        DependencyProperty.Register( "WindowInactiveBackground", typeof( Brush ), typeof( WindowModel ), new UIPropertyMetadata( null ) );
+
+    public Brush WindowInactiveBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowInactiveBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowInactiveBackgroundProperty, value );
+      }
+    }
+
+    #endregion //WindowInactiveBackground
+
+    #region WindowBorderBrush
+
+    public static readonly DependencyProperty WindowBorderBrushProperty =
+        DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( WindowModel ) );
+
+    public Brush WindowBorderBrush
+    {
+      get { return ( Brush )GetValue( WindowBorderBrushProperty ); }
+      set { SetValue( WindowBorderBrushProperty, value ); }
+    }
+
+    #endregion //WindowBorderBrush
+
+    #region TitleForeground
+
+    public static readonly DependencyProperty TitleForegroundProperty =
+        DependencyProperty.Register( "TitleForeground", typeof( Brush ), typeof( WindowModel ) );
+
+    public Brush TitleForeground
+    {
+      get { return ( Brush )GetValue( TitleForegroundProperty ); }
+      set { SetValue( TitleForegroundProperty, value ); }
+    }
+
+    #endregion //TitleForeground
+
+    #region TitleShadowBrush
+
+    public static readonly DependencyProperty TitleShadowBrushProperty =
+        DependencyProperty.Register( "TitleShadowBrush", typeof( Brush ), typeof( WindowModel ) );
+
+    public Brush TitleShadowBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( TitleShadowBrushProperty );
+      }
+      set
+      {
+        SetValue( TitleShadowBrushProperty, value );
+      }
+    }
+
+    #endregion //TitleShadowBrush
+
+    #region WindowBorderThickness
+
+    public static readonly DependencyProperty WindowBorderThicknessProperty =
+        DependencyProperty.Register( "WindowBorderThickness", typeof( Thickness ), typeof( WindowModel ) );
+
+    public Thickness WindowBorderThickness
+    {
+      get { return ( Thickness )GetValue( WindowBorderThicknessProperty ); }
+      set { SetValue( WindowBorderThicknessProperty, value ); }
+    }
+
+    #endregion //WindowBorderThickness
+
+    #region WindowOpacity
+
+    public static readonly DependencyProperty WindowOpacityProperty =
+        DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( WindowModel ) );
+
+    public double WindowOpacity
+    {
+      get { return ( double )GetValue( WindowOpacityProperty ); }
+      set { SetValue( WindowOpacityProperty, value ); }
+    }
+
+    #endregion //WindowOpacity
+
+    #region WindowStyle
+
+    public static readonly DependencyProperty WindowStyleProperty =
+        DependencyProperty.Register( "WindowStyle", typeof( WindowStyle ), typeof( WindowModel ) );
+
+    public WindowStyle WindowStyle
+    {
+      get { return ( WindowStyle )GetValue( WindowStyleProperty ); }
+      set { SetValue( WindowStyleProperty, value ); }
+    }
+
+    #endregion //WindowStyle
+
+    #region ResizeMode
+
+    public static readonly DependencyProperty ResizeModeProperty =
+        DependencyProperty.Register( "ResizeMode", typeof( ResizeMode ), typeof( WindowModel ) );
+
+    public ResizeMode ResizeMode
+    {
+      get { return ( ResizeMode )GetValue( ResizeModeProperty ); }
+      set { SetValue( ResizeModeProperty, value ); }
+    }
+
+    #endregion //ResizeMode
+
+    #region CloseButtonVisibility
+    public static readonly DependencyProperty CloseButtonVisibilityProperty =
+        DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( WindowModel ) );
+
+    public Visibility CloseButtonVisibility
+    {
+      get { return ( Visibility )GetValue( CloseButtonVisibilityProperty ); }
+      set { SetValue( CloseButtonVisibilityProperty, value ); }
+    }
+    #endregion //CloseButtonVisibility
+
+    #region CloseButtonStyle
+    public static readonly DependencyProperty CloseButtonStyleProperty =
+        DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( WindowModel ) );
+
+    public Style CloseButtonStyle
+    {
+      get { return ( Style )GetValue( CloseButtonStyleProperty ); }
+      set { SetValue( CloseButtonStyleProperty, value ); }
+    }
+    #endregion //CloseButtonStyle
+
+    #region MinimizeButtonStyle
+    public static readonly DependencyProperty MinimizeButtonStyleProperty =
+        DependencyProperty.Register( "MinimizeButtonStyle", typeof( Style ), typeof( WindowModel ) );
+
+    public Style MinimizeButtonStyle
+    {
+      get { return ( Style )GetValue( MinimizeButtonStyleProperty ); }
+      set { SetValue( MinimizeButtonStyleProperty, value ); }
+    }
+    #endregion //MinimizeButtonStyle
+
+    #region MaximizeButtonStyle
+    public static readonly DependencyProperty MaximizeButtonStyleProperty =
+        DependencyProperty.Register( "MaximizeButtonStyle", typeof( Style ), typeof( WindowModel ) );
+
+    public Style MaximizeButtonStyle
+    {
+      get { return ( Style )GetValue( MaximizeButtonStyleProperty ); }
+      set { SetValue( MaximizeButtonStyleProperty, value ); }
+    }
+    #endregion //MaximizeButtonStyle
+
+    #region RestoreButtonStyle
+    public static readonly DependencyProperty RestoreButtonStyleProperty =
+        DependencyProperty.Register( "RestoreButtonStyle", typeof( Style ), typeof( WindowModel ) );
+
+    public Style RestoreButtonStyle
+    {
+      get { return ( Style )GetValue( RestoreButtonStyleProperty ); }
+      set { SetValue( RestoreButtonStyleProperty, value ); }
+    }
+    #endregion //RestoreButtonStyle
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
new file mode 100644
index 000000000..9587d83f4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
@@ -0,0 +1,166 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.WindowContainerView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                 xmlns:xctkconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters;assembly=Xceed.Wpf.Toolkit"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                 xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                 Title="WindowContainer">
+   <local:DemoView.Description>
+      <Paragraph FontSize="14" FontFamily="Segoe">
+         <Run>WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up.</Run>
+         <LineBreak/>
+         <LineBreak />         
+         <Run>ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set.</Run>
+         <LineBreak/>
+         <LineBreak />
+         <Run>In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer.</Run>
+      </Paragraph>
+   </local:DemoView.Description>
+
+   <local:DemoView.Resources>
+        <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
+        <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
+
+        <ObjectDataProvider x:Key="GenderEnum" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="sample:GenderData" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+
+        <Style TargetType="TextBlock" BasedOn="{StaticResource {x:Type TextBlock}}">
+            <Style.Triggers>
+                <Trigger Property="IsEnabled" Value="False">
+                    <Setter Property="Foreground" Value="Gray" />
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </local:DemoView.Resources>
+
+    <Grid>
+        <Grid.RowDefinitions>
+             <RowDefinition Height="Auto" />
+             <RowDefinition Height="*" />
+       </Grid.RowDefinitions>
+
+       <GroupBox Header="Features" Grid.Row="0" Margin="5">
+         <Grid Margin="5">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="ModalBackgroundBrush:" VerticalAlignment="Center" />
+            <xctk:ColorPicker x:Name="_modalBackgroundColorPicker" Grid.Column="1" SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
+         </Grid>
+      </GroupBox>
+
+       <Grid Grid.Row="1" Margin="10">
+           <Grid.RowDefinitions>
+             <RowDefinition Height="Auto" />
+             <RowDefinition Height="*" />
+          </Grid.RowDefinitions>
+
+          <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+
+          <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*"/>
+            </Grid.ColumnDefinitions>
+
+            <StackPanel>
+                <CheckBox x:Name="_childWindowCheckBox" Content="Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+                <CheckBox x:Name="_modalChildWindowCheckBox" Content="Modal Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+                <CheckBox x:Name="_messageBoxCheckBox" Content="MessageBox" Margin="5" Checked="OnMessageBoxCheckBoxChecked" Unchecked="OnMessageBoxCheckBoxUnchecked" />
+            </StackPanel>
+
+            <Grid Column="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="80" />
+                    <ColumnDefinition />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition />
+                    <RowDefinition />
+                    <RowDefinition />
+                </Grid.RowDefinitions>
+
+                <!--1st Column -->
+                <TextBlock Text="First Name:" VerticalAlignment="Center" Margin="10"/>
+                <TextBox Grid.Column="1" Text="Michael" Width="150" Height="30" HorizontalAlignment="Left"/>
+                <TextBlock Grid.Row="1" Text="Last Name:" VerticalAlignment="Center" Margin="10"/>
+                <TextBox Grid.Row="1" Grid.Column="1" Width="150" Height="30" Text="Thompson" HorizontalAlignment="Left"/>
+                <TextBlock Grid.Row="2" Text="Address:" VerticalAlignment="Center" Margin="10"/>
+                <TextBox Grid.Row="2" Grid.Column="1" Width="150" Height="30" Text="65 Main street" HorizontalAlignment="Left"/>
+
+                <!-- 2nd Column-->
+                <TextBlock Grid.Column="2" Text="Gender:" VerticalAlignment="Center" Margin="10"/>
+                <ComboBox Grid.Column="3" Width="100" Height="30" ItemsSource="{Binding Source={StaticResource GenderEnum}}" SelectedIndex="0" Margin="5" HorizontalAlignment="Left"/>
+                <TextBlock Grid.Row="1" Grid.Column="2" Text="Job Title:" VerticalAlignment="Center" Margin="10"/>
+                <TextBox Grid.Row="1" Grid.Column="3" Width="100"  Height="30"  Text="Plumber" Margin="5" HorizontalAlignment="Left"/>
+                <TextBlock Grid.Row="2" Grid.Column="2" Text="Salary:" VerticalAlignment="Center" Margin="10"/>
+                <xctk:IntegerUpDown Grid.Row="2" Width="100" Grid.Column="3" Height="30" Value="30000" Increment="5000" Margin="5" HorizontalAlignment="Left"/>
+            </Grid>
+
+            <Border Grid.Column="1"
+                    BorderBrush="Black"
+                    BorderThickness="2"
+                    Margin="5,0,0,0">
+
+               <xctk:WindowContainer x:Name="_windowContainer" 
+                                     ModalBackgroundBrush="#80000000">
+                  <xctk:ChildWindow x:Name="_childWindow" 
+                                  Caption="Modaless ChildWindow"
+                                  Left="75"
+                                  Top="50"
+                                  Width="275"
+                                  Height="125"
+                                  WindowState="Open">
+                        <TextBlock Text="This is a regular Child Window" Padding="10"/>
+                </xctk:ChildWindow>
+
+                  <xctk:ChildWindow x:Name="_modalChildWindow" 
+                                  Caption="Modal ChildWindow"
+                                  IsModal="True"
+                                  Left="175"
+                                  Top="125"
+                                  Width="275"
+                                  Height="125"
+                                  WindowState="Open">
+                        <TextBlock Text="This is a modal Child Window" Padding="10"/>
+                </xctk:ChildWindow>
+
+                  <xctk:MessageBox x:Name="_messageBox"
+                                 Caption="MessageBox" 
+                                 Text="This is a MessageBox, always modal"
+                                 Closed="OnMessageBoxClose" />
+               </xctk:WindowContainer>
+
+            </Border>
+        </Grid>
+      </Grid>
+    </Grid>
+
+</local:DemoView>
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
new file mode 100644
index 000000000..6984260fd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
@@ -0,0 +1,82 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
+{
+  public enum GenderData
+  {
+    Male = 0, 
+    Female
+  }
+
+  /// <summary>
+  /// Interaction logic for WindowContainerView.xaml
+  /// </summary>
+  public partial class WindowContainerView : DemoView
+  {
+    public WindowContainerView()
+    {
+      InitializeComponent();
+
+      ObservableCollection<ColorItem> alphaAvailableColors = new ObservableCollection<ColorItem>();
+      foreach( ColorItem item in _modalBackgroundColorPicker.AvailableColors )
+      {
+        System.Windows.Media.Color color = System.Windows.Media.Color.FromArgb( ( byte )100, item.Color.R, item.Color.G, item.Color.B );
+        alphaAvailableColors.Add( new ColorItem( color, item.Name ) );
+      }
+      _modalBackgroundColorPicker.AvailableColors = alphaAvailableColors;
+    }
+
+    #region Event Handler
+
+    private void OnChildWindowCheckBoxClick( object sender, EventArgs e )
+    {
+      _childWindow.WindowState = Xceed.Wpf.Toolkit.WindowState.Open;
+    }
+
+    private void OnModalChildWindowCheckBoxClick( object sender, EventArgs e )
+    {
+      _modalChildWindow.WindowState = Xceed.Wpf.Toolkit.WindowState.Open;
+    }
+
+    private void OnMessageBoxCheckBoxChecked( object sender, EventArgs e )
+    {
+      _messageBox.ShowMessageBox();
+    }
+
+    private void OnMessageBoxCheckBoxUnchecked( object sender, EventArgs e )
+    {
+      _messageBox.Visibility = Visibility.Collapsed;
+      _messageBoxCheckBox.IsChecked = false;
+    }
+
+    private void OnMessageBoxClose( object sender, EventArgs e )
+    {
+      _messageBoxCheckBox.IsChecked = false;
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
new file mode 100644
index 000000000..cd15444af
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml
@@ -0,0 +1,49 @@
+﻿<!--*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views.WizardView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Wizard">   
+     <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The Wizard will explain how to do something in a series of steps.
+        </Paragraph>
+    </local:DemoView.Description>
+
+    <local:DemoView.Resources>
+        <xctk:Wizard x:Key="_wizard" FinishButtonClosesWindow="True" Help="OnWizardHelp">
+            <xctk:WizardPage Title="Welcome to my Wizard"
+                             Description="This Wizard will walk you though how to do something." />
+            <xctk:WizardPage PageType="Interior"
+                             Title="Page 1"
+                             Description="This is the first page in the process." />
+            <xctk:WizardPage PageType="Interior"
+                             Title="Page 2"
+                             Description="This is the second page in the process" />
+            <xctk:WizardPage PageType="Interior"
+                             Title="Last Page"
+                             Description="This is the last page in the process"
+                             CanFinish="True" />
+        </xctk:Wizard>
+    </local:DemoView.Resources>
+
+    <Grid>
+        <Button Content="Start Wizard" Click="OnButtonClick" Width="150" Height="50"/>
+    </Grid>
+
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
new file mode 100644
index 000000000..dab3cd12d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Wizard/Views/WizardView.xaml.cs
@@ -0,0 +1,62 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows;
+using System;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views
+{
+  /// <summary>
+  /// Interaction logic for WizardView.xaml
+  /// </summary>
+  public partial class WizardView : DemoView
+  {
+    private System.Windows.Window _window;
+
+    public WizardView()
+    {
+      InitializeComponent();
+    }
+
+    private void OnButtonClick( object sender, EventArgs e )
+    {
+      Xceed.Wpf.Toolkit.Wizard wizard = this.Resources[ "_wizard" ] as Xceed.Wpf.Toolkit.Wizard;
+      if( wizard != null )
+      {
+        wizard.CurrentPage = wizard.Items[ 0 ] as Xceed.Wpf.Toolkit.WizardPage;
+
+        if( _window != null )
+        {
+          _window.Content = null;
+          _window = null;
+        }
+        _window = new System.Windows.Window();
+        _window.Title = "Wizard demonstration";
+        _window.Content = wizard;
+        _window.Width = 600;
+        _window.Height = 400;
+        _window.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+        // Window will be closed by Wizard because FinishButtonClosesWindow = true and CancelButtonClosesWindow = true
+        _window.ShowDialog();
+      }
+    }
+
+    private void OnWizardHelp( object sender, EventArgs e )
+    {
+      System.Windows.MessageBox.Show( "This is the Help for the Wizard\n\n\n\n\n", "Wizard Help" );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
new file mode 100644
index 000000000..b3c84906e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/PointConverter.cs
@@ -0,0 +1,37 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public class PointConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return PointConverter.ConvertPoint( ( Point )value );
+    }
+
+    public static string ConvertPoint( Point point )
+    {
+      return string.Format( "{0},{1}",
+        Math.Round( point.X ), Math.Round( point.Y ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
new file mode 100644
index 000000000..b9765c8d5
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/RectConverter.cs
@@ -0,0 +1,33 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public class RectConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return string.Format( "({0}),({1})",
+        PointConverter.ConvertPoint( ( ( Rect )value ).TopLeft ),
+        PointConverter.ConvertPoint( ( ( Rect )value ).BottomRight ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
new file mode 100644
index 000000000..64209ab15
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/SimpleConverter.cs
@@ -0,0 +1,38 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public abstract class SimpleConverter : IValueConverter
+  {
+    protected abstract object Convert( object value );
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return this.Convert( value );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
new file mode 100644
index 000000000..155fa3ac3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewFinderConverter.cs
@@ -0,0 +1,30 @@
+﻿/****************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public class ViewFinderConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return ( value != null ) ? value.GetType().Name : null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
new file mode 100644
index 000000000..811bb538f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewNameConverter.cs
@@ -0,0 +1,30 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public class ViewNameConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return value.ToString().Remove( 0, 13 );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
new file mode 100644
index 000000000..e4b5409d3
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Converters/ViewStackCountConverter.cs
@@ -0,0 +1,30 @@
+﻿/**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ************************************************************************************/
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
+{
+  public class ViewStackCountConverter : SimpleConverter
+  {
+    protected override object Convert( object value )
+    {
+      return ( ( int )value ) - 1;
+    }
+  }  
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/Default.jpg b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/Default.jpg
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/Default.jpg
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/Default.jpg
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/ZoomboxProperties.xml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/ZoomboxProperties.xml
similarity index 100%
rename from ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Zoombox/Resources/ZoomboxProperties.xml
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Resources/ZoomboxProperties.xml
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
new file mode 100644
index 000000000..f4b2f2a1a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml
@@ -0,0 +1,491 @@
+﻿<!--**************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************-->
+<local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views.ZoomboxView"
+                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters"
+                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                 Title="Zoombox">
+    <local:DemoView.Description>
+        <Paragraph FontSize="14" FontFamily="Segoe">
+           The Zoombox control provides zoom and pan functionality for any UIElement (its content) that has a discrete size. It allows the content to be scaled up (zoomed in) or scaled down (zoomed out) using the mouse wheel, key bindings, or programmatically through methods and properties exposed by the control. Similarly, the content can be panned (translated) in any direction by dragging it with the mouse, using key bindings, or programmatically through methods and properties exposed by the control.&#x0a;&#x0a;The Zoombox control also provides a view finder that acts as a reduced-scale map of the contained element, showing exactly which portion of the content is visible within the Zoombox's viewport.
+        </Paragraph>
+    </local:DemoView.Description>
+
+
+   <Grid Grid.Row="1" 
+         HorizontalAlignment="Stretch"
+         VerticalAlignment="Stretch">
+      <Grid.ColumnDefinitions>
+         <ColumnDefinition Width="Auto" />
+         <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <TabControl Margin="20,20,0,20"
+                  Width="360"
+                  Grid.Column="0"
+                  Background="White"
+                  DataContext="{Binding ElementName=zoombox}">
+         <TabControl.Resources>
+            <xctk:RoundedValueConverter x:Key="Round"
+                                        Precision="2" />
+
+            <conv:RectConverter x:Key="rectConverter" />
+            <conv:PointConverter x:Key="pointConverter" />
+            <conv:ViewNameConverter x:Key="viewNameConverter" />
+            <conv:ViewFinderConverter x:Key="viewFinderConverter" />
+            <conv:ViewStackCountConverter x:Key="viewStackCountConverter" />
+
+            <XmlDataProvider x:Key="Props"
+                             Source="pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/Zoombox/Resources/ZoomboxProperties.xml"
+                             XPath="Properties" />
+            <Style x:Key="PropertyList"
+                   TargetType="{x:Type ItemsControl}">
+               <Setter Property="IsTabStop"
+                       Value="False" />
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type ItemsControl}">
+                        <ScrollViewer HorizontalScrollBarVisibility="Disabled"
+                                      VerticalScrollBarVisibility="Auto">
+                           <StackPanel IsItemsHost="True" />
+                        </ScrollViewer>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+
+            <Style x:Key="{x:Type ItemsControl}"
+                   TargetType="{x:Type ItemsControl}">
+               <Setter Property="IsTabStop"
+                       Value="False" />
+               <Setter Property="Template">
+                  <Setter.Value>
+                     <ControlTemplate TargetType="{x:Type ItemsControl}">
+                        <Grid MinHeight="45"
+                              x:Name="ItemGrid">
+                           <Popup AllowsTransparency="True"
+                                  Placement="Bottom"
+                                  PlacementTarget="{Binding RelativeSource={RelativeSource TemplatedParent}}"
+                                  HorizontalOffset="75"
+                                  IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsMouseOver, Mode=OneWay}">
+                              <Border Name="Border"
+                                      Background="#FFEFAC27"
+                                      BorderBrush="White"
+                                      Margin="0"
+                                      BorderThickness="1"
+                                      CornerRadius="10">
+                                 <TextBlock Margin="7"
+                                            MaxWidth="500"
+                                            TextWrapping="Wrap"
+                                            Foreground="White"
+                                            Text="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Tag.InnerText}" />
+                              </Border>
+                           </Popup>
+                           <Rectangle Grid.ColumnSpan="3"
+                                      Fill="White"
+                                      Stroke="{x:Null}"
+                                      StrokeThickness="0"
+                                      RadiusX="0"
+                                      RadiusY="0"
+                                      Margin="5,5,5,5" />
+                           <Grid IsItemsHost="True"
+                                 Margin="15,0">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="160" />
+                                 <ColumnDefinition Width="100" />
+                                 <ColumnDefinition Width="100" />
+                              </Grid.ColumnDefinitions>
+                           </Grid>
+                        </Grid>
+                     </ControlTemplate>
+                  </Setter.Value>
+               </Setter>
+            </Style>
+
+            <Style x:Key="{x:Type TextBlock}"
+                   BasedOn="{StaticResource {x:Type TextBlock}}"
+                   TargetType="{x:Type TextBlock}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Left" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+            </Style>
+
+            <Style x:Key="{x:Type Slider}"
+                   BasedOn="{StaticResource {x:Type Slider}}"
+                   TargetType="{x:Type Slider}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+               <Setter Property="Width"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type CheckBox}"
+                   BasedOn="{StaticResource {x:Type CheckBox}}"
+                   TargetType="{x:Type CheckBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Center" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type TextBox}"
+                   BasedOn="{StaticResource {x:Type TextBox}}"
+                   TargetType="{x:Type TextBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+            </Style>
+
+            <Style x:Key="{x:Type ComboBox}"
+                   BasedOn="{StaticResource {x:Type ComboBox}}"
+                   TargetType="{x:Type ComboBox}">
+               <Setter Property="HorizontalAlignment"
+                       Value="Stretch" />
+               <Setter Property="VerticalAlignment"
+                       Value="Center" />
+               <Setter Property="Height"
+                       Value="26" />
+               <Setter Property="Width"
+                       Value="Auto" />
+               <Setter Property="Margin"
+                       Value="10,5" />
+               <Setter Property="Grid.Column"
+                       Value="1" />
+               <Setter Property="SelectedValuePath"
+                       Value="Content" />
+            </Style>
+
+         </TabControl.Resources>
+
+         <TabItem Header="Animation">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Animation Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationAccelerationRatio}">
+                  <TextBlock Text="AnimationAccelerationRatio" />
+                  <Slider Name="AccelerationSlider"
+                          Maximum="1.0"
+                          Minimum="0.0"
+                          Value="{Binding AnimationAccelerationRatio}"
+                          ValueChanged="CoerceAnimationRatios" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding AnimationAccelerationRatio}"
+                             TextTrimming="CharacterEllipsis" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDecelerationRatio}">
+                  <TextBlock Text="AnimationDecelerationRatio" />
+                  <Slider Name="DecelerationSlider"
+                          Maximum="1.0"
+                          Minimum="0.0"
+                          Value="{Binding AnimationDecelerationRatio}"
+                          ValueChanged="CoerceAnimationRatios" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding AnimationDecelerationRatio}"
+                             TextTrimming="CharacterEllipsis" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AnimationDuration}">
+                  <TextBlock Text="AnimationDuration" />
+                  <Slider IsSnapToTickEnabled="True"
+                          TickFrequency="50"
+                          Minimum="0"
+                          Maximum="2000"
+                          Value="{Binding AnimationDuration.TimeSpan.TotalMilliseconds, Mode=OneWay}"
+                          ValueChanged="AdjustAnimationDuration" />
+                  <TextBlock Grid.Column="2"
+                             Text="{Binding AnimationDuration}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsAnimated}">
+                  <TextBlock Text="IsAnimated" />
+                  <CheckBox IsChecked="{Binding IsAnimated}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="Keyboard">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="KeyModifier Collections" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragModifiers}">
+                  <TextBlock Text="DragModifiers" />
+                  <TextBox Text="{Binding DragModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=RelativeZoomModifiers}">
+                  <TextBlock Text="RelativeZoomModifiers" />
+                  <TextBox Text="{Binding RelativeZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomModifiers}">
+                  <TextBlock Text="ZoomModifiers" />
+                  <TextBox Text="{Binding ZoomModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomToSelectionModifiers}">
+                  <TextBlock Text="ZoomToSelectionModifiers" />
+                  <TextBox Text="{Binding ZoomToSelectionModifiers, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Response to Preview Events" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=DragOnPreview}">
+                  <TextBlock Text="DragOnPreview" />
+                  <CheckBox IsChecked="{Binding DragOnPreview}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=NavigateOnPreview}">
+                  <TextBlock Text="NavigateOnPreview" />
+                  <CheckBox IsChecked="{Binding NavigateOnPreview}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOnPreview}">
+                  <TextBlock Text="ZoomOnPreview" />
+                  <CheckBox IsChecked="{Binding ZoomOnPreview}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Input States" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreDragModifiersActive}">
+                  <TextBlock Text="AreDragModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreDragModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreRelativeZoomModifiersActive}">
+                  <TextBlock Text="AreRelativeZoomModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreRelativeZoomModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomModifiersActive}">
+                  <TextBlock Text="AreZoomModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreZoomModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AreZoomToSelectionModifiersActive}">
+                  <TextBlock Text="AreZoomToSelectionModifiersActive"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding AreZoomToSelectionModifiersActive, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsDraggingContent}">
+                  <TextBlock Text="IsDraggingContent"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding IsDraggingContent, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=IsSelectingRegion}">
+                  <TextBlock Text="IsSelectingRegion"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding IsSelectingRegion, Mode=OneWay}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="Position &amp; Scale">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Position Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=PanDistance}">
+                  <TextBlock Text="PanDistance" />
+                  <TextBox Text="{Binding PanDistance, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Position}">
+                  <TextBlock Text="Position" />
+                  <TextBox IsEnabled="False" 
+                           Text="{Binding Position, Mode=OneWay, Converter={StaticResource pointConverter}}" />
+               </ItemsControl>
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="Scale Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=AutoWrapContentWithViewbox}">
+                  <TextBlock Text="AutoWrapContentWithViewbox"
+                             Grid.ColumnSpan="2" />
+                  <CheckBox IsChecked="{Binding AutoWrapContentWithViewbox}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MaxScale}">
+                  <TextBlock Text="MaxScale" />
+                  <TextBox Text="{Binding MaxScale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=MinScale}">
+                  <TextBlock Text="MinScale" />
+                  <TextBox Text="{Binding MinScale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Scale}">
+                  <TextBlock Text="Scale" />
+                  <TextBox Text="{Binding Scale, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomOrigin}">
+                  <TextBlock Text="ZoomOrigin" />
+                  <TextBox Text="{Binding ZoomOrigin, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ZoomPercentage}">
+                  <TextBlock Text="ZoomPercentage" />
+                  <TextBox Text="{Binding ZoomPercentage, UpdateSourceTrigger=PropertyChanged}" />
+               </ItemsControl>
+
+            </ItemsControl>
+         </TabItem>
+
+         <TabItem Header="View">
+            <ItemsControl Style="{StaticResource PropertyList}">
+
+               <TextBlock Margin="5,10,5,5"
+                          FontWeight="Bold"
+                          FontSize="12"
+                          Text="View Properties" />
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentView}">
+                  <TextBlock Text="CurrentView" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding CurrentView, Converter={StaticResource viewNameConverter}, Mode=OneWay}"
+                           Grid.ColumnSpan="2"
+                           Height="Auto"
+                           Width="155"
+                           Margin="5,10"
+                           HorizontalAlignment="Left"
+                           TextWrapping="WrapWithOverflow" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=CurrentViewIndex}">
+                  <TextBlock Text="CurrentViewIndex" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding CurrentViewIndex, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=EffectiveViewStackMode}">
+                  <TextBlock Text="EffectiveViewStackMode" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding EffectiveViewStackMode, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasBackStack}">
+                  <TextBlock Text="HasBackStack" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding HasBackStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=HasForwardStack}">
+                  <TextBlock Text="HasForwardStack" />
+                  <CheckBox IsEnabled="False"
+                            IsChecked="{Binding HasForwardStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinder}">
+                  <TextBlock Text="ViewFinder" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewFinder, Converter={StaticResource viewFinderConverter}, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewFinderVisibility}">
+                  <TextBlock Text="ViewFinderVisibility" />
+                  <ComboBox  SelectedValue="{Binding ViewFinderVisibility}">
+                     <ComboBoxItem Content="{x:Static Visibility.Collapsed}" />
+                     <ComboBoxItem Content="{x:Static Visibility.Hidden}" />
+                     <ComboBoxItem Content="{x:Static Visibility.Visible}" />
+                  </ComboBox>
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=Viewport}">
+                  <TextBlock Text="Viewport" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding Viewport, Converter={StaticResource rectConverter}, Mode=OneWay}"
+                           Grid.ColumnSpan="2"
+                           Width="155"
+                           Margin="5,10"
+                           HorizontalAlignment="Left" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStack}">
+                  <TextBlock Text="ViewStack" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStack, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackCount}">
+                  <TextBlock Text="ViewStackCount" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStackCount, Mode=OneWay}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackIndex}">
+                  <TextBlock Text="ViewStackIndex" />
+                  <Slider Minimum="0"
+                          Maximum="{Binding ViewStackCount, Converter={StaticResource viewStackCountConverter}}"
+                          Value="{Binding ViewStackIndex}" />
+                  <TextBlock Grid.Column="2"
+                             Width="50"
+                             Text="{Binding ViewStackIndex}" />
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackMode}">
+                  <TextBlock Text="ViewStackMode" />
+                  <ComboBox  SelectedValue="{Binding ViewStackMode}">
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Auto}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Default}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Disabled}" />
+                     <ComboBoxItem Content="{x:Static xctk:ZoomboxViewStackMode.Manual}" />
+                  </ComboBox>
+               </ItemsControl>
+               <ItemsControl Tag="{Binding Source={StaticResource Props}, XPath=ViewStackSource}">
+                  <TextBlock Text="ViewStackSource" />
+                  <TextBox IsEnabled="False"
+                           Text="{Binding ViewStackSource}" />
+               </ItemsControl>
+            </ItemsControl>
+         </TabItem>
+      </TabControl>
+      <xctk:Zoombox x:Name="zoombox"
+                    ViewStackIndex="0"
+                    Grid.Column="1"
+                    Margin="20"
+                    Focusable="True"
+                    IsTabStop="True">
+         <xctk:Zoombox.ViewStack>
+            <xctk:ZoomboxView>Fit</xctk:ZoomboxView>
+         </xctk:Zoombox.ViewStack>
+         <Image Source="pack://application:,,,/Xceed.Wpf.Toolkit.LiveExplorer;component/Samples/Zoombox/Resources/Default.jpg" />
+
+      </xctk:Zoombox>
+   </Grid>
+</local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
new file mode 100644
index 000000000..23bc53f4f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Zoombox/Views/ZoomboxView.xaml.cs
@@ -0,0 +1,57 @@
+﻿/***************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  *************************************************************************************/
+
+using System.Windows.Controls;
+using System.Windows.Data;
+using System;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views
+{
+  /// <summary>
+  /// Interaction logic for ZoomboxView.xaml
+  /// </summary>
+  public partial class ZoomboxView : DemoView
+  {
+    public ZoomboxView()
+    {
+      InitializeComponent();
+    }
+
+    private void AdjustAnimationDuration( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      Slider slider = sender as Slider;
+      if( slider == null )
+        return;
+
+      zoombox.AnimationDuration = TimeSpan.FromMilliseconds( slider.Value );
+    }
+
+    private void CoerceAnimationRatios( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      Slider slider = sender as Slider;
+      if( slider == null )
+        return;
+
+      Slider otherRatio = ( sender == this.AccelerationSlider ) ? this.DecelerationSlider : this.AccelerationSlider;
+
+      if( slider.Value + otherRatio.Value > 1 )
+      {
+        otherRatio.Value = 1 - slider.Value;
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
new file mode 100644
index 000000000..5569dd585
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
@@ -0,0 +1,819 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Xceed.Wpf.Toolkit.LiveExplorer</RootNamespace>
+    <AssemblyName>Xceed.Wpf.Toolkit.LiveExplorer</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ProductName>Xceed Extended WPF Toolkit LiveExplorer</ProductName>
+    <PublisherName>Xceed Software Inc.</PublisherName>
+    <ApplicationRevision>5</ApplicationRevision>
+    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <PlatformTarget>x86</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.Services.Client" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Xceed.Wpf.Samples.SampleData">
+      <HintPath>..\..\Libs\Xceed.Wpf.Samples.SampleData.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj">
+      <Project>{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}</Project>
+      <Name>Xceed.Wpf.AvalonDock.Themes.Aero</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj">
+      <Project>{89286EB4-B4A1-418C-839A-067B00F442D8}</Project>
+      <Name>Xceed.Wpf.AvalonDock.Themes.Metro</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj">
+      <Project>{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}</Project>
+      <Name>Xceed.Wpf.AvalonDock.Themes.VS2010</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
+      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
+      <Name>Xceed.Wpf.AvalonDock</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj">
+      <Project>{63648392-6CE9-4A60-96D4-F9FD718D29B0}</Project>
+      <Name>Xceed.Wpf.DataGrid</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
+      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
+      <Name>Xceed.Wpf.Toolkit</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="CodeBox.cs" />
+    <Compile Include="Core\CSharpFormatter.cs" />
+    <Compile Include="Core\XamlFormatter.cs" />
+    <Compile Include="HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\AvalonDock\Views\AvalonDockView.xaml.cs">
+      <DependentUpon>AvalonDockView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Converters\IntegerToTimespanConverter.cs" />
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml.cs">
+      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button\Views\ButtonSpinnerView.xaml.cs">
+      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button\Views\DropDownSplitButtonView.xaml.cs">
+      <DependentUpon>DropDownSplitButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Calculator\Views\CalculatorView.xaml.cs">
+      <DependentUpon>CalculatorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Converters\GraduationModeToComboBoxConverter.cs" />
+    <Compile Include="Samples\Chart\Views\ChartAxisView.xaml.cs">
+      <DependentUpon>ChartAxisView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartLegendView.xaml.cs">
+      <DependentUpon>ChartLegendView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml.cs">
+      <DependentUpon>ChartSeriesBasicTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml.cs">
+      <DependentUpon>ChartSeriesDataPointsBindingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml.cs">
+      <DependentUpon>ChartStylingAxesGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingColumnSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingLineSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingPieSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\CheckLists\Views\CheckListsView.xaml.cs">
+      <DependentUpon>CheckListsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Color\Views\ColorView.xaml.cs">
+      <DependentUpon>ColorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DataGrid\Converters\FlagPathConverter.cs" />
+    <Compile Include="Samples\DataGrid\UniqueIDCellValidationRule.cs" />
+    <Compile Include="Samples\DataGrid\Views\DataGridView.xaml.cs">
+      <DependentUpon>DataGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml.cs">
+      <DependentUpon>MultiColumnComboBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DateTime\Converters\DateTimeToTimeSpanConverter.cs" />
+    <Compile Include="Samples\DateTime\Views\DateTimeView.xaml.cs">
+      <DependentUpon>DateTimeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ListBox\Converters\BoxArtImageSourceConverter.cs" />
+    <Compile Include="Samples\ListBox\Views\ListBoxView.xaml.cs">
+      <DependentUpon>ListBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Magnifier\Converters\ColorConverter.cs" />
+    <Compile Include="Samples\Magnifier\Converters\VisibilityConverter.cs" />
+    <Compile Include="Samples\Magnifier\Views\MagnifierView.xaml.cs">
+      <DependentUpon>MagnifierView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Numeric\Views\NumericView.xaml.cs">
+      <DependentUpon>NumericView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Panels\Converters\ComboBoxToVisibilityConverter.cs" />
+    <Compile Include="Samples\Panels\Views\SwitchPanelView.xaml.cs">
+      <DependentUpon>SwitchPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Converters\SliceLabelConverter.cs" />
+    <Compile Include="Samples\Pie\Views\PieChartView.xaml.cs">
+      <DependentUpon>PieChartView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Views\PieProgressView.xaml.cs">
+      <DependentUpon>PieProgressView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Views\PieView.xaml.cs">
+      <DependentUpon>PieView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PileFlowPanel\Converters\FullNameStringConverter.cs" />
+    <Compile Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml.cs">
+      <DependentUpon>PileFlowPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Converters\DimensionConverter.cs" />
+    <Compile Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml.cs">
+      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml.cs">
+      <DependentUpon>PropertyGridPropertyItemStyleView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml.cs">
+      <DependentUpon>PropertyGridDefinitionKeyView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml.cs">
+      <DependentUpon>PropertyGridEditorDefinitionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml.cs">
+      <DependentUpon>PropertyGridAttributesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml.cs">
+      <DependentUpon>PropertyGridSelectedObjectView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml.cs">
+      <DependentUpon>PropertyGridCustomPropertyView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml.cs">
+      <DependentUpon>PropertyGridPropertiesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml.cs">
+      <DependentUpon>PropertyGridPropertiesSourceView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.Designer.cs">
+      <DependentUpon>DisplayLocalizationRes.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml.cs">
+      <DependentUpon>PropertyGridBindingToStructsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml.cs">
+      <DependentUpon>PropertyGridCategoryOrderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml.cs">
+      <DependentUpon>PropertyGridCustomEditorsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml.cs">
+      <DependentUpon>PropertyGridDefaultEditorsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml.cs">
+      <DependentUpon>PropertyGridDisplayLocalizationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml.cs">
+      <DependentUpon>PropertyGridMultiSelectedObjectsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml.cs">
+      <DependentUpon>PropertyGridSpecifyingPropertiesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridView.xaml.cs">
+      <DependentUpon>PropertyGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\AutoSelectTextboxView.xaml.cs">
+      <DependentUpon>AutoSelectTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\MaskedTextboxView.xaml.cs">
+      <DependentUpon>MaskedTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\MultiLineTextEditorView.xaml.cs">
+      <DependentUpon>MultiLineTextEditorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\RichTextboxView.xaml.cs">
+      <DependentUpon>RichTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\WatermarkTextboxView.xaml.cs">
+      <DependentUpon>WatermarkTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Converters\FlagPathConverter.cs" />
+    <Compile Include="Samples\Theming\Views\ThemingCoreWPFView.xaml.cs">
+      <DependentUpon>ThemingCoreWPFView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingDataGridView.xaml.cs">
+      <DependentUpon>ThemingDataGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml.cs">
+      <DependentUpon>ThemingExtendedToolkitView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingListBoxView.xaml.cs">
+      <DependentUpon>ThemingListBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml.cs">
+      <DependentUpon>TimelinePanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Converters\IntToBoolConverter.cs" />
+    <Compile Include="Samples\Window\Converters\WindowStateToBoolConverter.cs" />
+    <Compile Include="Samples\Window\Resources\WindowModelEditor.xaml.cs">
+      <DependentUpon>WindowModelEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\ChildWindowView.xaml.cs">
+      <DependentUpon>ChildWindowView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\StylableWindowView.xaml.cs">
+      <DependentUpon>StylableWindowView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\WindowContainerView.xaml.cs">
+      <DependentUpon>WindowContainerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Wizard\Views\WizardView.xaml.cs">
+      <DependentUpon>WizardView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Zoombox\Converters\PointConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\RectConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\SimpleConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewFinderConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewNameConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewStackCountConverter.cs" />
+    <Compile Include="Samples\Zoombox\Views\ZoomboxView.xaml.cs">
+      <DependentUpon>ZoomboxView.xaml</DependentUpon>
+    </Compile>
+    <Page Include="HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
+    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
+    <Compile Include="Core\LiveExplorerTreeViewItem.cs" />
+    <Compile Include="DemoView.cs" />
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Resources\LiveExplorerScrollViewer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\TextBlockStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\AvalonDock\Views\AvalonDockView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Resources\Common.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Button\Views\ButtonSpinnerView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Button\Views\DropDownSplitButtonView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Calculator\Views\CalculatorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartAxisView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartLegendView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\CheckLists\Views\CheckListsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Color\Views\ColorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DataGrid\Views\DataGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DateTime\Views\DateTimeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\ListBox\Views\ListBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Magnifier\Views\MagnifierView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Numeric\Views\NumericView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Panels\Views\SwitchPanelView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieChartView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieProgressView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\AutoSelectTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\MaskedTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\MultiLineTextEditorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\RichTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\WatermarkTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingCoreWPFView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingDataGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingListBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Window\Resources\FancyStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Window\Resources\WindowModelEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Window\Views\ChildWindowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Window\Views\StylableWindowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Window\Views\WindowContainerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Wizard\Views\WizardView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Zoombox\Views\ZoomboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.fr.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>DisplayLocalizationRes.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Properties\app.manifest">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Samples\Magnifier\Resources\SampleText.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\xceed_logo.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\BusyIndicator\Images\CdBurning32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPicture.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureA.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureB.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureC.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureD.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\Working.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Zoombox\Resources\Default.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Zoombox\Resources\ZoomboxProperties.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Window\Resources\xceed_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\DataGrid\OpenSourceImages\MultiColumnsComboBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Panels\OpenSourceImages\AnimatedTimelinePanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\AutoStretchStackPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\CameraPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Canvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Carousel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\DockPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Grid.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\PerspectivePanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\RadialCanvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\RelativeCanvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\StackedStackPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\StackPanel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\ExtendedWPFToolkitControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\CoreWPFControls.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\DataGridControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Localization.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\CategoryOrdering.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\MultiSelectedObjects.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartAxis.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartBasicTypes.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartLegend.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartSeriesDataPointsBinding.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingAxesGrid.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingColumnSeries.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingLineSeries.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingPieSeries.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\AvalonDock\Images\address-book--pencil.png" />
+    <Resource Include="Samples\AvalonDock\Images\address-book-open.png" />
+    <Resource Include="Samples\AvalonDock\Images\alarm-clock-blue.png" />
+    <Resource Include="Samples\AvalonDock\Images\document.png" />
+    <Resource Include="Samples\AvalonDock\Images\property-blue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PileFlowPanel\OpenSourceImages\PileFlowPanel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ListBox\Resources\Netflix_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\Resources\woman.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\ListBoxControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ListBox\OpenSourceImages\ListBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\EditorDefinitions.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\DefinitionKey.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\DefinitionKey.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\PropertiesSource.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\PropertiesSource.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Properties.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Properties.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\CustomProperty.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4 Client Profile %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="App.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Chart\Photo\1.bmp" />
+    <Resource Include="Samples\Chart\Photo\2.bmp" />
+    <Resource Include="Samples\Chart\Photo\3.bmp" />
+    <Resource Include="Samples\Chart\Photo\4.bmp" />
+    <Resource Include="Samples\Chart\Photo\5.bmp" />
+    <Resource Include="Samples\Chart\Photo\6.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Text\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(SolutionDir)Src\Xceed.Wpf.Toolkit.LiveExplorer\bin\$(ConfigurationName)\Samples" /s /Y /I
+</PostBuildEvent>
+  </PropertyGroup>
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk
new file mode 100644
index 000000000..1bdc91203
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/sn.snk differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index 52b871dbc..8b8ce9d3f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@@ -1,36 +1,30 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 [assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
 
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "1.9";
+  public const string BaseVersion = "2.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string PublicKeyToken = "ba83ff368b7563c6";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string DesignFullName =
-    "Xceed.Wpf.Toolkit,Version=" +
-    Version +
-    ",Culture=neutral,PublicKeyToken=" + PublicKeyToken;
-
 
 
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
index e67d3d81f..3316fb13a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 internal static class _XceedVersionInfoCommon
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
index 5d98b342e..0b2738c97 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index d22f66f78..d83c3666b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
index e52ab2230..141fbab99 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index 485f1cf91..d1ce2a793 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
index c34add1e1..b218170f9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..9372c7700
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,150 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- BusyIndicator                                                                   -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="BusyIndicatorTemplate" TargetType="{x:Type local:BusyIndicator}">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="VisibilityStates">
+                    <VisualState x:Name="Hidden">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Visible">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="BusyStatusStates">
+                    <VisualState x:Name="Idle">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Busy">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+            <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+            <ContentPresenter x:Name="busycontent">
+                <ContentPresenter.Content>
+                    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <Border Background="White" BorderThickness="1" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" CornerRadius="0">
+                            <Border Margin="1" Background="{TemplateBinding Background}" CornerRadius="0">
+                                <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                </Grid>
+                            </Border>
+                        </Border>
+                    </Grid>
+                </ContentPresenter.Content>
+            </ContentPresenter>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:BusyIndicator}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BusyContent" Value="Please wait..." />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="OverlayStyle">
+            <Setter.Value>
+                <Style TargetType="Rectangle">
+                    <Setter Property="Fill" Value="White" />
+                    <Setter Property="Opacity" Value="0.5" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ProgressBarStyle">
+            <Setter.Value>
+                <Style TargetType="ProgressBar">
+                    <Setter Property="IsIndeterminate" Value="True" />
+                    <Setter Property="Height" Value="15" />
+                    <Setter Property="Margin" Value="8,0,8,8" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="DisplayAfter" Value="00:00:00.1" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template" Value="{StaticResource BusyIndicatorTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 8f7cb9c06..dce79f841 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
index effa98f0d..ddc7dbfa1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls.Primitives;
@@ -219,6 +219,50 @@ protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
       }
     }
 
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Up:
+          {
+            if( this.AllowSpin )
+            {
+              this.OnSpin( new SpinEventArgs( SpinDirection.Increase ) );
+            }
+            e.Handled = true;
+            break;
+          }
+        case Key.Down:
+          {
+            if( this.AllowSpin )
+            {
+              this.OnSpin( new SpinEventArgs( SpinDirection.Decrease ) );
+            }
+            e.Handled = true;
+            break;
+          }
+      }
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      base.OnMouseWheel( e );
+
+      if( !e.Handled && this.AllowSpin )
+      {
+        if( e.Delta < 0 )
+        {
+          this.OnSpin( new SpinEventArgs( SpinDirection.Decrease, true ) );
+        }
+        else if( 0 < e.Delta )
+        {
+          this.OnSpin( new SpinEventArgs( SpinDirection.Increase, true ) );
+        }
+
+        e.Handled = true;
+      }
+    }
+
     /// <summary>
     /// Called when valid spin direction changed.
     /// </summary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
index fcc90d1ce..b9d009969 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
index 6b0000a09..fe94ec649 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
@@ -34,6 +34,15 @@ public SpinDirection Direction
       private set;
     }
 
+    /// <summary>
+    /// Get or set whheter the spin event originated from a mouse wheel event.
+    /// </summary>
+    public bool UsingMouseWheel
+    {
+      get;
+      private set;
+    }
+
     /// <summary>
     /// Initializes a new instance of the SpinEventArgs class.
     /// </summary>
@@ -43,5 +52,12 @@ public SpinEventArgs( SpinDirection direction )
     {
       Direction = direction;
     }
+
+    public SpinEventArgs( SpinDirection direction, bool usingMouseWheel )
+      : base()
+    {
+      Direction = direction;
+      UsingMouseWheel = usingMouseWheel;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
index d4ae42955..0f1c9647f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
index 4cedc4c2a..0a7aba235 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..a16663a64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,94 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+
+    <!-- =============================================================================== -->
+    <!-- ButtonSpinner                                                                   -->
+    <!-- =============================================================================== -->
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+    <Style TargetType="{x:Type local:ButtonSpinner}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="IsTabStop" Value="True" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+                    <Border x:Name="Border" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" >
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                            <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+
+                                <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                                <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                            </Grid>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
index cc44ed107..91d1fb130 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
index aa12b59d3..6100f6bf2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
index 286b41da2..d24c8e08d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..6a7fc8716
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,259 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+    </Style>
+
+    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Background" Value="Pink" />
+    </Style>
+
+    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Background" Value="#FFE8E8E8" />
+    </Style>
+
+
+    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:Calculator}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Calculator}">
+                    <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="0">
+                        <Grid Margin="10">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1">
+                                <StackPanel>
+                                    <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                                    <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </StackPanel>
+                            </Border>
+                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_Display" Property="Background" Value="Azure" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
index 5ec4ba52f..9d68cc033 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
index 61df0160c..4c0d2e8ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -168,7 +168,21 @@ public override void OnApplyTemplate()
       if( _calculatorPopup != null )
         _calculatorPopup.Opened += CalculatorPopup_Opened;
 
+      if( _calculator != null )
+        _calculator.ValueChanged -= OnCalculatorValueChanged;
+
       _calculator = GetTemplateChild( PART_Calculator ) as Calculator;
+
+      if( _calculator != null )
+        _calculator.ValueChanged += OnCalculatorValueChanged;
+    }
+
+    private void OnCalculatorValueChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
+    {
+      if( IsValid( _calculator.Value ) )
+      {
+        this.Value = _calculator.Value;
+      }
     }
 
     #endregion //Base Class Overrides
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..0fbee30a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,163 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+									   RenderMouseOver="{TemplateBinding IsMouseOver}"
+									   RenderPressed="{TemplateBinding IsPressed}">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                        </chrome:ButtonChrome>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- =============================================================================== -->
+    <!-- CalculatorUpDown                                                                -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:CalculatorUpDown}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+                    <Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <local:ButtonSpinner x:Name="PART_Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                                <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                BorderThickness="0" 
+                                                Background="{TemplateBinding Background}"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                SelectAllOnGotFocus="{TemplateBinding SelectAllOnGotFocus}"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                            </local:ButtonSpinner>
+                            <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   Focusable="False"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                        </Grid>
+                        <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                <StackPanel>
+                                    <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
index 05e782479..eab4b3529 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -75,7 +75,7 @@
    </Style>
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <!-- =============================================================================== -->
@@ -145,8 +145,7 @@
                                              BorderThickness="0"
                                              DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
                                              Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
                         </StackPanel>
                      </Border>
                   </Popup>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
index 340b01679..2af21811b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Linq;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..920923cb8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,113 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                        </Grid>
+                    </chrome:ButtonChrome>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:CheckComboBox}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                            <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                                <Border x:Name="DropDownBorder" MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                                    <ScrollViewer x:Name="DropDownScrollViewer">
+                                        <Grid RenderOptions.ClearTypeHint="Enabled">
+                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                            </Canvas>
+                                            <ItemsPresenter x:Name="PART_ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </Grid>
+                        </Popup>
+
+                        <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                        <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
index 41e0b4b31..b60ce08ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
index 50783e25a..3796b06da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..e8703bfcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,48 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <Style TargetType="{x:Type local:CheckListBox}">
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index b47f97eb8..1c95f81c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
index 3c8399a32..eee107a01 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -23,142 +23,44 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
-  [TemplatePart( Name = PART_DragWidget, Type = typeof( Border ) )]
-  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]
-  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]
-  public class ChildWindow : ContentControl
+#pragma warning disable 0809
+#pragma warning disable 0618 
+
+  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]  
+  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]   
+  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
+  public class ChildWindow : WindowControl
   {
-    private const string PART_DragWidget = "PART_DragWidget";
-    private const string PART_CloseButton = "PART_CloseButton";
-    private const string PART_WindowRoot = "PART_WindowRoot";
-    private const string PART_Root = "PART_Root";
+    private const string PART_WindowRoot = "PART_WindowRoot";  
+    private const string PART_Root = "PART_Root";   
+    private const string PART_WindowControl = "PART_WindowControl";
+    private const int _horizontalOffset = 3;
+    private const int _verticalOffset = 3;
 
     #region Private Members
 
-    private Grid _root;
-    private TranslateTransform _moveTransform = new TranslateTransform();
-    private bool _startupPositionInitialized;
-    private bool _isMouseCaptured;
-    private Point _clickPoint;
-    private Point _oldPosition;
-    private Border _dragWidget;
-    private FrameworkElement _parentContainer;
-    private Rectangle _modalLayer = new Rectangle();
-    private Canvas _modalLayerPanel = new Canvas();
-
-    private const int _horizaontalOffset = 3;
-    private const int _verticalOffset = 3;
-
-    bool _ignorePropertyChanged;
+    private Grid _root; 
+    private TranslateTransform _moveTransform = new TranslateTransform();  
+    private bool _startupPositionInitialized;  
+    private FrameworkElement _parentContainer;  
+    private Rectangle _modalLayer = new Rectangle();  
+    private Canvas _modalLayerPanel = new Canvas();  
+    private Grid _windowRoot;  
+    private WindowControl _windowControl;
+    private bool _ignorePropertyChanged;
+    private bool _hasWindowContainer;  
 
     #endregion //Private Members
 
-    #region Properties
-
-    #region Internal Properties
-
-    internal Grid WindowRoot
-    {
-      get;
-      private set;
-    }
-    internal Thumb DragWidget
-    {
-      get;
-      private set;
-    }
-    internal Button MinimizeButton
-    {
-      get;
-      private set;
-    }
-    internal Button MaximizeButton
-    {
-      get;
-      private set;
-    }
-    internal Button CloseButton
-    {
-      get;
-      private set;
-    }
-
-    #endregion //Internal Properties
-
     #region Public Properties
 
-    #region Caption
-
-    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( object ), typeof( ChildWindow ), new UIPropertyMetadata( String.Empty ) );
-    public object Caption
-    {
-      get
-      {
-        return ( object )GetValue( CaptionProperty );
-      }
-      set
-      {
-        SetValue( CaptionProperty, value );
-      }
-    }
-
-    #endregion //Caption
-
-    #region CaptionForeground
-
-    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
-    public Brush CaptionForeground
-    {
-      get
-      {
-        return ( Brush )GetValue( CaptionForegroundProperty );
-      }
-      set
-      {
-        SetValue( CaptionForegroundProperty, value );
-      }
-    }
-
-    #endregion //CaptionForeground
-
-    #region CloseButtonStyle
-
-    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Style CloseButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CloseButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //CloseButtonStyle
-
-    #region CloseButtonVisibility
-
-    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( ChildWindow ), new PropertyMetadata( Visibility.Visible ) );
-    public Visibility CloseButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonVisibilityProperty, value );
-      }
-    }
-
-    #endregion //CloseButtonVisibility
-
     #region DialogResult
 
     private bool? _dialogResult;
@@ -181,7 +83,7 @@ public bool? DialogResult
         if( _dialogResult != value )
         {
           _dialogResult = value;
-          Close();
+          this.Close();
         }
       }
     }
@@ -259,55 +161,38 @@ private static void OnIsModalPropertyChanged( DependencyObject d, DependencyProp
         childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
 
+    internal event EventHandler<EventArgs> IsModalChanged;
+
     private void OnIsModalChanged( bool oldValue, bool newValue )
     {
-      if( newValue )
-      {
-        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
-        ShowModalLayer();
-      }
-      else
+      EventHandler<EventArgs> handler = IsModalChanged;
+      if( handler != null )
       {
-        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
-        HideModalLayer();
+        handler( this, EventArgs.Empty );
       }
-    }
 
-    #endregion //IsModal
-
-    #region Left
-
-    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ) ) );
-    public double Left
-    {
-      get
-      {
-        return ( double )GetValue( LeftProperty );
-      }
-      set
+      if( !_hasWindowContainer )
       {
-        SetValue( LeftProperty, value );
+        if( newValue )
+        {
+          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
+          ShowModalLayer();
+        }
+        else
+        {
+          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
+          HideModalLayer();
+        }
       }
     }
 
-    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = obj as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    private void OnLeftPropertyChanged( double oldValue, double newValue )
-    {
-      Left = GetRestrictedLeft();
-      ProcessMove( newValue - oldValue, 0 );
-    }
-
-    #endregion //Left
+    #endregion //IsModal
 
-    #region OverlayBrush
+    #region OverlayBrush (Obsolete)
 
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public Brush OverlayBrush
     {
       get
@@ -327,6 +212,7 @@ private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropert
         childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
     {
       _modalLayer.Fill = newValue;
@@ -334,9 +220,11 @@ protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
 
     #endregion //OverlayBrush
 
-    #region OverlayOpacity
+    #region OverlayOpacity (Obsolete)
 
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public double OverlayOpacity
     {
       get
@@ -356,93 +244,13 @@ private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPrope
         childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
     {
       _modalLayer.Opacity = newValue;
     }
 
-    #endregion //OverlayOpacity
-
-    #region Top
-
-    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ) ) );
-    public double Top
-    {
-      get
-      {
-        return ( double )GetValue( TopProperty );
-      }
-      set
-      {
-        SetValue( TopProperty, value );
-      }
-    }
-
-    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = obj as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    private void OnTopPropertyChanged( double oldValue, double newValue )
-    {
-      Top = GetRestrictedTop();
-      ProcessMove( 0, newValue - oldValue );
-    }
-
-    #endregion //TopProperty
-
-    #region WindowBackground
-
-    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Brush WindowBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowBackgroundProperty, value );
-      }
-    }
-
-    #endregion //WindowBackground
-
-    #region WindowBorderBrush
-
-    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Brush WindowBorderBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBorderBrushProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //WindowBorderBrush
-
-    #region WindowOpacity
-
-    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public double WindowOpacity
-    {
-      get
-      {
-        return ( double )GetValue( WindowOpacityProperty );
-      }
-      set
-      {
-        SetValue( WindowOpacityProperty, value );
-      }
-    }
-
-    #endregion //WindowOpacity
+    #endregion //OverlayOpacity  
 
     #region WindowStartupLocation
 
@@ -512,8 +320,6 @@ protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, Windo
 
     #endregion //Public Properties
 
-    #endregion //Properties
-
     #region Constructors
 
     static ChildWindow()
@@ -525,8 +331,6 @@ public ChildWindow()
     {
       DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
 
-      IsVisibleChanged += ChildWindow_IsVisibleChanged;
-
       _modalLayer.Fill = OverlayBrush;
       _modalLayer.Opacity = OverlayOpacity;
     }
@@ -535,73 +339,81 @@ public ChildWindow()
 
     #region Base Class Overrides
 
+    internal override bool AllowPublicIsActiveChange
+    {
+      get { return false; }
+    }
+
     public override void OnApplyTemplate()
     {
       base.OnApplyTemplate();
 
-      if( _dragWidget != null )
+      if( _windowControl != null )
       {
-        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ) );
-        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ) );
-        _dragWidget.MouseMove -= ( o, e ) => HeaderMouseMove( e );
+        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClick( e );
+        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
       }
-
-      _dragWidget = GetTemplateChild( PART_DragWidget ) as Border;
-
-      if( _dragWidget != null )
+      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
+      if( _windowControl != null )
       {
-        _dragWidget.AddHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ), true );
-        _dragWidget.AddHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ), true );
-        _dragWidget.MouseMove += ( o, e ) => HeaderMouseMove( e );
+        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClick( e );
+        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
       }
 
-      if( CloseButton != null )
-        CloseButton.Click -= ( o, e ) => Close();
-
-      CloseButton = GetTemplateChild( PART_CloseButton ) as Button;
-
-      if( CloseButton != null )
-        CloseButton.Click += ( o, e ) => Close();
+      this.UpdateBlockMouseInputsPanel();
 
-      WindowRoot = GetTemplateChild( PART_WindowRoot ) as Grid;
-      WindowRoot.RenderTransform = _moveTransform;
+      _windowRoot = this.GetTemplateChild( PART_WindowRoot ) as Grid;
+      _windowRoot.RenderTransform = _moveTransform;
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
 
-      _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
-      _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
-      _parentContainer.SizeChanged += ParentContainer_SizeChanged;
-
-      //initialize our modal background width/height
-      _modalLayer.Height = _parentContainer.ActualHeight;
-      _modalLayer.Width = _parentContainer.ActualWidth;
-
-      //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
-      //we need to handle the loaded event and reposition the window.
-      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      if( !_hasWindowContainer )
       {
-        _parentContainer.Loaded += ( o, e ) =>
+        _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
+        if( _parentContainer != null )
+        {
+          _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
+          _parentContainer.SizeChanged += ParentContainer_SizeChanged;
+
+          //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+          //we need to handle the loaded event and reposition the window.
+          if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+          {
+            _parentContainer.Loaded += ( o, e ) =>
             {
               ExecuteOpen();
             };
-      }
+          }
+        }
 
-      _root = GetTemplateChild( PART_Root ) as Grid;
+        this.Unloaded += new RoutedEventHandler( ChildWindow_Unloaded );
+
+        //initialize our modal background width/height
+        _modalLayer.Height = _parentContainer.ActualHeight;
+        _modalLayer.Width = _parentContainer.ActualWidth;
+
+        _root = this.GetTemplateChild( PART_Root ) as Grid;
 
 #if VS2008
       FocusVisualStyle = null;
 #else
-      Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
-      if( focusStyle != null )
-      {
-        Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
-        focusStyle.Setters.Add( focusStyleDataContext );
-        FocusVisualStyle = focusStyle;
-      }
+        Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
+        if( focusStyle != null )
+        {
+          Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
+          focusStyle.Setters.Add( focusStyleDataContext );
+          FocusVisualStyle = focusStyle;
+        }
 #endif
-      _root.Children.Add( _modalLayerPanel );
+        _root.Children.Add( _modalLayerPanel );
+      }
     }
 
     protected override void OnGotFocus( RoutedEventArgs e )
     {
+      base.OnGotFocus( e );
+
       Action action = () =>
       {
         if( FocusedElement != null )
@@ -620,12 +432,12 @@ protected override void OnKeyDown( KeyEventArgs e )
         switch( e.Key )
         {
           case Key.Left:
-            this.Left -= _horizaontalOffset;
+            this.Left -= _horizontalOffset;
             e.Handled = true;
             break;
 
           case Key.Right:
-            this.Left += _horizaontalOffset;
+            this.Left += _horizontalOffset;
             e.Handled = true;
             break;
 
@@ -642,54 +454,118 @@ protected override void OnKeyDown( KeyEventArgs e )
       }
     }
 
-    #endregion //Base Class Overrides
+    protected override void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      base.OnLeftPropertyChanged( oldValue, newValue );
 
-    #region Event Handlers
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
+      if( !_hasWindowContainer )
+      {
+          Left = GetRestrictedLeft();
+        ProcessMove( newValue - oldValue, 0 );
+      }
+    }
 
-    void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    protected override void OnTopPropertyChanged( double oldValue, double newValue )
     {
-      if( ( bool )e.NewValue )
-        Focus();
+      base.OnTopPropertyChanged( oldValue, newValue );
+
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
+      if( !_hasWindowContainer )
+      {
+          Top = GetRestrictedTop();
+        ProcessMove( 0, newValue - oldValue );
+      }
     }
 
-    void HeaderLeftMouseButtonDown( object sender, MouseButtonEventArgs e )
+    internal override void UpdateBlockMouseInputsPanel()
     {
-      e.Handled = true;
-      Focus();
-      _dragWidget.CaptureMouse();
-      _isMouseCaptured = true;
-      _clickPoint = e.GetPosition( null ); //save off the mouse position
-      _oldPosition = new Point( Left, Top ); //save off our original window position
+      if( _windowControl != null )
+      {
+        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
+      }
     }
 
-    private void HeaderMouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
     {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
       e.Handled = true;
-      _dragWidget.ReleaseMouseCapture();
-      _isMouseCaptured = false;
+
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        if( object.Equals( e.OriginalSource, _windowControl ) )
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == FlowDirection.RightToLeft )
+            left = this.Left - e.HorizontalChange;
+          else
+            left = this.Left + e.HorizontalChange;
+
+          this.Left = left;
+          this.Top += e.VerticalChange;
+        }
+      }
     }
 
-    private void HeaderMouseMove( MouseEventArgs e )
+    protected virtual void OnHeaderIconDoubleClick( MouseButtonEventArgs e )
     {
-      if( _isMouseCaptured && Visibility == Visibility.Visible )
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
+
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = HeaderIconDoubleClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
       {
-        Point currentPosition = e.GetPosition( null ); //our current mouse position
+        this.Close();
+      }
+    }
 
-        Left = _oldPosition.X + ( currentPosition.X - _clickPoint.X );
-        Top = _oldPosition.Y + ( currentPosition.Y - _clickPoint.Y );
+    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
 
-        //this helps keep our mouse position in sync with the drag widget position
-        Point dragWidgetPosition = e.GetPosition( _dragWidget );
-        if( dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight )
-        {
-          return;
-        }
+      e.Handled = true;
 
-        _oldPosition = new Point( Left, Top );
-        _clickPoint = e.GetPosition( Window.GetWindow( this ) ); //store the point where we are relative to the window
+      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
       }
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
     {
       if( DesignerProperties.GetIsInDesignMode( this ) )
@@ -703,6 +579,27 @@ private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
+    private void ChildWindow_Unloaded( object sender, RoutedEventArgs e )
+    {
+      if( _parentContainer != null )
+      {
+        _parentContainer.LayoutUpdated -= ParentContainer_LayoutUpdated;
+        _parentContainer.SizeChanged -= ParentContainer_SizeChanged;        
+
+        //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+        //we need to handle the loaded event and reposition the window.
+        if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+        {
+          _parentContainer.Loaded -= ( o, ev ) =>
+          {
+            ExecuteOpen();
+          };
+        }
+      }
+    }
+
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
     {
       //resize our modal layer
@@ -714,12 +611,17 @@ void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
       Top = GetRestrictedTop();
     }
 
+
+
     #endregion //Event Handlers
 
     #region Methods
 
     #region Private
 
+
+
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedLeft() instead." )]
     private double GetRestrictedLeft()
     {
       if( Left < 0 )
@@ -727,9 +629,9 @@ private double GetRestrictedLeft()
 
       if( _parentContainer != null )
       {
-        if( Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
+        if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
         {
-          double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
+          double left = _parentContainer.ActualWidth - _windowRoot.ActualWidth;
           return left < 0 ? 0 : left;
         }
       }
@@ -737,6 +639,7 @@ private double GetRestrictedLeft()
       return Left;
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedTop() instead." )]
     private double GetRestrictedTop()
     {
       if( Top < 0 )
@@ -744,9 +647,9 @@ private double GetRestrictedTop()
 
       if( _parentContainer != null )
       {
-        if( Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
+        if( Top + _windowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
         {
-          double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
+          double top = _parentContainer.ActualHeight - _windowRoot.ActualHeight;
           return top < 0 ? 0 : top;
         }
       }
@@ -802,12 +705,20 @@ private void ExecuteOpen()
     {
       _dialogResult = null; //reset the dialogResult to null each time the window is opened
 
-      if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
-        CenterChildWindow();
+      if( !_hasWindowContainer )
+        if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
+          CenterChildWindow(); 
 
-      BringToFront();
+      if( !_hasWindowContainer )
+        BringToFront();
     }
 
+    private bool IsCurrentWindow( object windowtoTest )
+    {
+      return object.Equals( _windowControl, windowtoTest );
+    }
+
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.BringToFront() instead." )]
     private void BringToFront()
     {
       int index = 0;
@@ -821,15 +732,17 @@ private void BringToFront()
         Canvas.SetZIndex( _modalLayerPanel, index - 2 );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.CenterChild() instead." )]
     private void CenterChildWindow()
     {
       if( _parentContainer != null )
       {
-        Left = ( _parentContainer.ActualWidth - WindowRoot.ActualWidth ) / 2.0;
-        Top = ( _parentContainer.ActualHeight - WindowRoot.ActualHeight ) / 2.0;
+        Left = ( _parentContainer.ActualWidth - _windowRoot.ActualWidth ) / 2.0;
+        Top = ( _parentContainer.ActualHeight - _windowRoot.ActualHeight ) / 2.0;
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void ShowModalLayer()
     {
       if( !DesignerProperties.GetIsInDesignMode( this ) )
@@ -841,11 +754,13 @@ private void ShowModalLayer()
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void HideModalLayer()
     {
       _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use the ChildWindow in a WindowContainer instead." )]
     private void ProcessMove( double x, double y )
     {
       _moveTransform.X += x;
@@ -895,5 +810,9 @@ protected virtual void OnClosing( CancelEventArgs e )
     }
 
     #endregion //Events
+
   }
+
+#pragma warning restore 0809
+#pragma warning restore 0618
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
index 5470079c4..690c92328 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
index 027fd2a05..072097080 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..0df15cc20
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,108 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+        <ResourceDictionary Source="../../Core/Themes/Aero2/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="Orange" />
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ChildWindow                                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="MinWidth" Value="120" />
+        <Setter Property="MinHeight" Value="45" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+                    <Grid x:Name="PART_Root">
+                        <!-- Used For modal layer Deprecated-->
+                        <Grid.Resources>
+                            <!-- Used For KeyboardFocus Deprecated-->
+                            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                            <Style x:Key="FocusVisualStyle" TargetType="Control">
+                                <Setter Property="BorderBrush" Value="Black" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="Margin" Value="-1" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate>
+                                            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                                <Rectangle.RenderTransform>
+                                                    <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
+                                                </Rectangle.RenderTransform>
+                                            </Rectangle>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Grid.Resources>
+
+                        <!-- Used for drag -->
+                        <Grid x:Name="PART_WindowRoot"
+                          HorizontalAlignment="Left" 
+                          VerticalAlignment="Top" 
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}" 
+                          Width="{TemplateBinding Width}" 
+                          Height="{TemplateBinding Height}">
+
+                            <prim:WindowControl x:Name="PART_WindowControl" 
+                                            Caption="{TemplateBinding Caption}" 
+                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
+                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
+                                            CaptionIcon="{TemplateBinding CaptionIcon}"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                            BorderThickness="{TemplateBinding BorderThickness}" 
+                                            IsActive="{TemplateBinding IsActive}"
+                                            WindowBackground="{TemplateBinding WindowBackground}" 
+                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
+                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
+                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
+                                            Content="{TemplateBinding Content}"
+                                            WindowStyle="{TemplateBinding WindowStyle}"
+                                            Width="{TemplateBinding Width}"
+                                            Height="{TemplateBinding Height}">
+                            </prim:WindowControl>
+                        </Grid>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Closed">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
index 05bdbf1c5..39825ca78 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
@@ -1,141 +1,44 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+       <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
+       <ResourceDictionary Source="../../Core/Themes/Generic/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
 
    <!-- =============================================================================== -->
    <!-- ChildWindow                                                                      -->
    <!-- =============================================================================== -->
 
-   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
-   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
-      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
-      <GradientStop Color="#00FFFFFF" Offset="1" />
-   </LinearGradientBrush>
-
-   <Style TargetType="{x:Type local:ChildWindow}">
-      <Setter Property="Background" Value="#FFFFFFFF" />
-      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CaptionForeground" Value="#FF000000" />
-      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="VerticalContentAlignment" Value="Top" />
-      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-      <Setter Property="WindowOpacity" Value="1.0" />
+   <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+      <Setter Property="MinWidth" Value="140" />
+      <Setter Property="MinHeight" Value="40" />
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-               <Grid x:Name="PART_Root">
-                  <Grid.Resources>
-                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                <Grid x:Name="PART_Root"> <!-- Used For modal layer Deprecated-->
+                    <Grid.Resources>  <!-- Used For KeyboardFocus Deprecated-->
                      <Style x:Key="FocusVisualStyle" TargetType="Control">
                         <Setter Property="BorderBrush" Value="Black" />
                         <Setter Property="Background" Value="Transparent" />
@@ -145,90 +48,53 @@
                               <ControlTemplate>
                                  <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
                                     <Rectangle.RenderTransform>
-                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                       <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
                                     </Rectangle.RenderTransform>
                                  </Rectangle>
                               </ControlTemplate>
                            </Setter.Value>
                         </Setter>
                      </Style>
-                  </Grid.Resources>
-
-                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                     <Grid.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform />
-                           <SkewTransform />
-                           <RotateTransform />
-                           <TranslateTransform />
-                        </TransformGroup>
-                     </Grid.RenderTransform>
-
-                     <!-- Borders -->
-                     <Grid  x:Name="WindowGrid">
-                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
-                        <Grid Margin="0" Background="{x:Null}">
-                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
-                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
-                        </Grid>
-                     </Grid>
-
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" MinHeight="26" />
-                           <RowDefinition />
-                        </Grid.RowDefinitions>
-
-                        <!-- Content Border -->
-                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                           <Grid.RowDefinitions>
-                              <RowDefinition />
-                              <RowDefinition Height="Auto" />
-                           </Grid.RowDefinitions>
-                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
-                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                              <ContentPresenter x:Name="Content"
-                                                Content="{TemplateBinding Content}" 
-                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                           </Border>
-                        </Grid>
-
-                        <!-- Header -->
-                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                           <Grid>
-                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
-                                 <!-- Caption -->
-                                 <ContentControl x:Name="Caption"
-                                                 Margin="5,0,0,0"
-                                                 IsTabStop="False"
-                                                 HorizontalAlignment="Stretch"
-                                                 Content="{TemplateBinding Caption}"
-                                                 Foreground="{TemplateBinding CaptionForeground}" />
-                              </Grid>
-                           </Grid>
-                        </Border>
-                     </Grid>
-
-                     <!-- Buttons -->
-                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
-                           <Path Height="10"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center"
-                                 Width="12"
-                                 Fill="#E4FFFFFF"
-                                 Stretch="Fill"
-                                 Stroke="#FF535666" 
-                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
-                        </Button>
-                     </Border>
-                  </Grid>
-               </Grid>
+                  </Grid.Resources> 
+
+                    <!-- Used for drag -->
+                    <Grid x:Name="PART_WindowRoot"
+                          HorizontalAlignment="Left" 
+                          VerticalAlignment="Top" 
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}" 
+                          Width="{TemplateBinding Width}" 
+                          Height="{TemplateBinding Height}">
+
+                        <prim:WindowControl x:Name="PART_WindowControl" 
+                                            Caption="{TemplateBinding Caption}" 
+                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
+                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
+                                            CaptionIcon="{TemplateBinding CaptionIcon}"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                            BorderThickness="{TemplateBinding BorderThickness}" 
+                                            IsActive="{TemplateBinding IsActive}"
+                                            WindowBackground="{TemplateBinding WindowBackground}" 
+                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
+                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
+                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
+                                            Content="{TemplateBinding Content}"
+                                            WindowStyle="{TemplateBinding WindowStyle}"
+                                            Width="{TemplateBinding Width}"
+                                            Height="{TemplateBinding Height}">
+                        </prim:WindowControl>
+                    </Grid>
+                </Grid>
+
                <ControlTemplate.Triggers>
                   <Trigger Property="WindowState" Value="Closed">
                      <Setter Property="Visibility" Value="Collapsed" />
                   </Trigger>
-               </ControlTemplate.Triggers>
+                </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
index 778219bee..89c66d096 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c1e522349
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,124 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+
+    <!-- =============================================================================== -->
+    <!-- ButtonChrome                                                                    -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type chrome:ButtonChrome}">
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+                    <Grid>
+
+                        <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
+
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <!-- If button is disabled, not checked, and is rendered normal -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="False" />
+                                <Condition Property="RenderChecked" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled and pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderPressed" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderChecked" Value="False" />
+                                <Condition Property="RenderMouseOver" Value="True" />
+                                <Condition Property="RenderPressed" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled, checked, the mouse is not over, and it is not pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderChecked" Value="True" />
+                                <Condition Property="RenderMouseOver" Value="False" />
+                                <Condition Property="RenderPressed" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderFocused" Value="True" />
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderPressed" Value="False" />
+                                <Condition Property="RenderMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if not rendered normally -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderNormal" Value="False" />
+                                <Condition Property="RenderChecked" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
+                        </MultiTrigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
index e9655483d..2ee81a1a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
index 3b414ba40..f3ff8e305 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -26,10 +26,38 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace Xceed.Wpf.Toolkit
 {
+  [TemplatePart( Name = PART_NewItemTypesComboBox, Type = typeof( ComboBox ) )]
   public class CollectionControl : Control
   {
+    private const string PART_NewItemTypesComboBox = "PART_NewItemTypesComboBox";
+
+    #region Private Members
+
+    private ComboBox _newItemTypesComboBox;
+
+    #endregion
+
     #region Properties
 
+    #region IsReadOnly Property
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControl ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
+    #endregion  //Items
+
+    #region Items Property
+
     public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public ObservableCollection<object> Items
     {
@@ -43,6 +71,10 @@ public ObservableCollection<object> Items
       }
     }
 
+    #endregion  //Items
+
+    #region ItemsSource Property
+
     public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
     public IList ItemsSource
     {
@@ -72,7 +104,11 @@ public void OnItemSourceChanged( IList oldValue, IList newValue )
       }
     }
 
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null, new PropertyChangedCallback( ItemsSourceTypeChanged ) ) );
+    #endregion  //ItemsSource
+
+    #region ItemsSourceType Property
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemsSourceType
     {
       get
@@ -85,25 +121,9 @@ public Type ItemsSourceType
       }
     }
 
-    private static void ItemsSourceTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      CollectionControl CollectionControl = ( CollectionControl )d;
-      if( CollectionControl != null )
-        CollectionControl.ItemsSourceTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
+    #endregion //ItemsSourceType
 
-    protected virtual void ItemsSourceTypeChanged( Type oldValue, Type newValue )
-    {
-      List<Type> types = new List<Type>();
-      Type listType = GetListItemType( newValue );
-
-      if( listType != null )
-      {
-        types.Add( listType );
-      }
-
-      NewItemTypes = types;
-    }
+    #region NewItemType Property
 
     public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public IList<Type> NewItemTypes
@@ -118,6 +138,10 @@ public IList<Type> NewItemTypes
       }
     }
 
+    #endregion  //NewItemType
+
+    #region SelectedItem Property
+
     public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public object SelectedItem
     {
@@ -131,8 +155,27 @@ public object SelectedItem
       }
     }
 
+    #endregion  //SelectedItem
+
     #endregion //Properties
 
+    #region Override Methods
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.Loaded -= new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
+
+      _newItemTypesComboBox = GetTemplateChild( PART_NewItemTypesComboBox ) as ComboBox;
+
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.Loaded += new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
+    }
+
+    #endregion
+
     #region Constructors
 
     static CollectionControl()
@@ -151,30 +194,137 @@ public CollectionControl()
 
     #endregion //Constructors
 
+    #region Events
+
+    #region ItemDeleting Event
+
+    public delegate void ItemDeletingRoutedEventHandler( object sender, ItemDeletingEventArgs e );
+
+    public static readonly RoutedEvent ItemDeletingEvent = EventManager.RegisterRoutedEvent( "ItemDeleting", RoutingStrategy.Bubble, typeof( ItemDeletingRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemDeletingRoutedEventHandler ItemDeleting
+    {
+      add
+      {
+        AddHandler( ItemDeletingEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemDeletingEvent, value );
+      }
+    }
+
+    #endregion //ItemDeleting Event
+
+    #region ItemDeleted Event
+
+    public delegate void ItemDeletedRoutedEventHandler( object sender, ItemEventArgs e );
+
+    public static readonly RoutedEvent ItemDeletedEvent = EventManager.RegisterRoutedEvent( "ItemDeleted", RoutingStrategy.Bubble, typeof( ItemDeletedRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemDeletedRoutedEventHandler ItemDeleted
+    {
+      add
+      {
+        AddHandler( ItemDeletedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemDeletedEvent, value );
+      }
+    }
+
+    #endregion //ItemDeleted Event
+
+    #region ItemAdding Event
+
+    public delegate void ItemAddingRoutedEventHandler( object sender, ItemAddingEventArgs e );
+
+    public static readonly RoutedEvent ItemAddingEvent = EventManager.RegisterRoutedEvent( "ItemAdding", RoutingStrategy.Bubble, typeof( ItemAddingRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemAddingRoutedEventHandler ItemAdding
+    {
+      add
+      {
+        AddHandler( ItemAddingEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemAddingEvent, value );
+      }
+    }
+
+    #endregion //ItemAdding Event
+
+    #region ItemAdded Event
+
+    public delegate void ItemAddedRoutedEventHandler( object sender, ItemEventArgs e );
+
+    public static readonly RoutedEvent ItemAddedEvent = EventManager.RegisterRoutedEvent( "ItemAdded", RoutingStrategy.Bubble, typeof( ItemAddedRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemAddedRoutedEventHandler ItemAdded
+    {
+      add
+      {
+        AddHandler( ItemAddedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemAddedEvent, value );
+      }
+    }
+
+    #endregion //ItemAdded Event
+
+    #endregion
+
+    #region EventHandlers
+
+    void NewItemTypesComboBox_Loaded( object sender, RoutedEventArgs e )
+    {
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.SelectedIndex = 0;
+    }
+
+    #endregion
+
     #region Commands
 
     private void AddNew( object sender, ExecutedRoutedEventArgs e )
     {
       var newItem = CreateNewItem( ( Type )e.Parameter );
+
+      var eventArgs = new ItemAddingEventArgs( ItemAddingEvent, newItem );
+      this.RaiseEvent( eventArgs );
+      if( eventArgs.Cancel )
+        return;
+      newItem = eventArgs.Item;
+
       Items.Add( newItem );
+
+      this.RaiseEvent( new ItemEventArgs( ItemAddedEvent, newItem ) );
+
       SelectedItem = newItem;
     }
 
     private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
     {
       Type t = e.Parameter as Type;
-      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null )
+      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null && !IsReadOnly)
         e.CanExecute = true;
     }
 
     private void Delete( object sender, ExecutedRoutedEventArgs e )
     {
+      var eventArgs = new ItemDeletingEventArgs( ItemDeletingEvent, e.Parameter );
+      this.RaiseEvent( eventArgs );
+      if( eventArgs.Cancel )
+        return;
+
       Items.Remove( e.Parameter );
+
+      this.RaiseEvent( new ItemEventArgs( ItemDeletedEvent, e.Parameter ) );
     }
 
     private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
     {
-      e.CanExecute = e.Parameter != null;
+      e.CanExecute = e.Parameter != null && !IsReadOnly;
     }
 
     private void MoveDown( object sender, ExecutedRoutedEventArgs e )
@@ -188,7 +338,7 @@ private void MoveDown( object sender, ExecutedRoutedEventArgs e )
 
     private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
     {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) )
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) && !IsReadOnly )
         e.CanExecute = true;
     }
 
@@ -203,7 +353,7 @@ private void MoveUp( object sender, ExecutedRoutedEventArgs e )
 
     private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
     {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 )
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 && !IsReadOnly )
         e.CanExecute = true;
     }
 
@@ -213,10 +363,17 @@ private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
 
     private static void CopyValues( object source, object destination )
     {
-      FieldInfo[] myObjectFields = source.GetType().GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
-      foreach( FieldInfo fi in myObjectFields )
+      Type currentType = source.GetType();
+
+      while( currentType != null )
       {
-        fi.SetValue( destination, fi.GetValue( source ) );
+        FieldInfo[] myObjectFields = currentType.GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+        foreach( FieldInfo fi in myObjectFields )
+        {
+          fi.SetValue( destination, fi.GetValue( source ) );
+        }
+
+        currentType = currentType.BaseType;
       }
     }
 
@@ -249,16 +406,6 @@ private object CreateNewItem( Type type )
       return Activator.CreateInstance( type );
     }
 
-    internal static Type GetListItemType(Type listType)
-    {
-      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
-        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
-
-      return ( iListOfT != null )
-        ? iListOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
     public void PersistChanges()
     {
       IList list = ComputeItemsSource();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
index 47d4088ce..76e3a6919 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <Window x:Class="Xceed.Wpf.Toolkit.CollectionControlDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -31,8 +31,9 @@
 
       <local:CollectionControl x:Name="_propertyGrid"
                               ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Mode=TwoWay}"
+                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
 
       <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5">
          <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
index 9554a034e..7f5b90a21 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -67,6 +67,19 @@ public IList<Type> NewItemTypes
       }
     }
 
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlDialog ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
     #endregion //Properties
 
     #region Constructors
@@ -76,10 +89,16 @@ public CollectionControlDialog()
       InitializeComponent();
     }
 
-    public CollectionControlDialog( Type type )
+    public CollectionControlDialog( Type itemsourceType )
       : this()
     {
-      ItemsSourceType = type;
+      ItemsSourceType = itemsourceType;
+    }
+
+    public CollectionControlDialog( Type itemsourceType, IList<Type> newItemTypes )
+      : this( itemsourceType )
+    {
+      NewItemTypes = newItemTypes;
     }
 
     #endregion //Constructors
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
new file mode 100644
index 000000000..d0ccf3e48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
@@ -0,0 +1,74 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Converters
+{
+  /// <summary>
+  /// This multi-value converter is used in the CollectionControl template
+  /// to determine the list of possible new item types that will be shown in the combo box.
+  /// 
+  /// If the second value (i.e., CollectionControl.NewItemTypes) is not null, this list will be used.
+  /// Otherwise, if the first value (i.e., CollectionControl.ItemsSourceType) is a "IList&lt;T&gt;"
+  /// type, the new item type list will contain "T".
+  /// 
+  /// </summary>
+  public class NewItemTypesComboBoxConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+
+      if( values.Length != 2 )
+        throw new ArgumentException("The 'values' argument should contain 2 objects.");
+
+      if( values[ 1 ] != null )
+      {
+        if( !values[ 1 ].GetType().IsGenericType || !(values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type) )
+          throw new ArgumentException( "The 'value' argument is not of the correct type." );
+
+        return values[ 1 ];
+      }
+      else if( values[ 0 ] != null )
+      {
+        if( !( values[ 0 ].GetType() is Type ) )
+          throw new ArgumentException( "The 'value' argument is not of the correct type." );
+
+        List<Type> types = new List<Type>();
+        Type listType = ListUtilities.GetListItemType( ( Type )values[ 0 ] );
+        if( listType != null )
+        {
+          types.Add( listType );
+        }
+
+        return types;
+      }
+
+      return null;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
new file mode 100644
index 000000000..12d3bb479
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemAddingEventArgs : CancelRoutedEventArgs
+  {
+    #region Constructor
+
+    public ItemAddingEventArgs( RoutedEvent itemAddingEvent, object itemAdding )
+      : base( itemAddingEvent )
+    {
+      Item = itemAdding;
+    }
+
+    #endregion
+
+    #region Properties
+
+    #region Item Property
+
+    public object Item
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
+    #endregion //Properties
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
new file mode 100644
index 000000000..d8343bdd6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
@@ -0,0 +1,56 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemDeletingEventArgs : CancelRoutedEventArgs
+  {
+    #region Private Members
+
+    private object _item;
+
+    #endregion
+
+    #region Constructor
+
+    public ItemDeletingEventArgs( RoutedEvent itemDeletingEvent, object itemDeleting )
+      : base( itemDeletingEvent )
+    {
+      _item = itemDeleting;
+    }
+
+    #region Property Item
+
+    public object Item
+    {
+      get
+      {
+        return _item;
+      }
+    }
+
+    #endregion
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
new file mode 100644
index 000000000..aa45304a6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
@@ -0,0 +1,55 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemEventArgs : RoutedEventArgs
+  {
+    #region Protected Members
+
+    private object _item;
+
+    #endregion
+
+    #region Constructor
+
+    internal ItemEventArgs( RoutedEvent routedEvent, object newItem )
+      : base( routedEvent )
+    {
+      _item = newItem;
+    }
+
+    #endregion
+
+    #region Property Item
+
+    public object Item
+    {
+      get
+      {
+        return _item;
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
index 92b2a25ec..f35a248d5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -103,6 +103,21 @@ protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
 
     #endregion //ItemsSource
 
+    #region IsReadOnly
+
+    public static readonly DependencyProperty IsReadOnlyProperty =
+        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false ) );
+
+    public bool IsReadOnly
+    {
+      get { return ( bool )GetValue( IsReadOnlyProperty ); }
+      set { SetValue( IsReadOnlyProperty, value ); }
+    }
+
+    #endregion //IsReadOnly
+
+    #region ItemsSourceType
+
     public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemsSourceType
     {
@@ -116,6 +131,10 @@ public Type ItemsSourceType
       }
     }
 
+    #endregion ItemsSourceType
+
+    #region ItemType
+
     public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemType
     {
@@ -129,6 +148,8 @@ public Type ItemType
       }
     }
 
+    #endregion ItemType
+
     #region Text
 
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnTextChanged ) );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..2ed475c49
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,173 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+    <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
+
+    <Style x:Key="CollectionControlButtonStyle" TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.6" />
+            </Trigger>
+        </Style.Triggers>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="26" />
+        <Setter Property="Width" Value="26" />
+    </Style>
+
+    <Style TargetType="{x:Type local:CollectionControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CollectionControl}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="1.5*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  DisplayMemberPath="Name">
+                                    <ComboBox.ItemsSource>
+                                        <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
+                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
+                                        </MultiBinding>
+                                    </ComboBox.ItemsSource>
+                                </ComboBox>
+                                <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
+                                <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                                <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                                    <Button Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Path Fill="#FF000000" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                                    </Button>
+                                    <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Path Fill="#FF000000" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                                    </Button>
+                                    <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Image Stretch="None" Height="16" Width="16" Margin="1" Source="./../Images/Delete16.png" />
+                                    </Button>
+                                </StackPanel>
+                            </Grid>
+                            <Grid Column="1" Margin="20,0,0,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Column="1" Text="Properties:" />
+                                <pg:PropertyGrid Grid.Row="1"
+                                         Grid.Column="1"
+                                         Margin="0,5,0,0"
+                                         HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Stretch"
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                         IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
+                    <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          IsReadOnly="{TemplateBinding IsReadOnly}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
index 86e83a01b..1a800b232 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
@@ -1,27 +1,29 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
    <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+   <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
 
    <Style x:Key="CollectionControlButtonStyle" TargetType="{x:Type Button}">
       <Style.Triggers>
@@ -57,20 +59,25 @@
                            <RowDefinition />
                         </Grid.RowDefinitions>
                         <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                        <ComboBox x:Name="_newItemTypes"
+                        <ComboBox x:Name="PART_NewItemTypesComboBox"
                                   Grid.Row="1"
                                   Margin="0,0,0,3"
                                   HorizontalAlignment="Stretch"
-                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                  DisplayMemberPath="Name"
-                                  SelectedIndex="0" />
+                                  DisplayMemberPath="Name">
+                            <ComboBox.ItemsSource>
+                                <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
+                                </MultiBinding>
+                            </ComboBox.ItemsSource>
+                        </ComboBox>
                         <Button Margin="3,0,0,3"
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Padding="5,0"
                                 Content="Add" 
                                 Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
                         <ListBox x:Name="_itemsListBox"
                                  Grid.Row="2"
                                  Grid.ColumnSpan="2"
@@ -99,7 +106,7 @@
                                    Style="{StaticResource CollectionControlButtonStyle}"
                                    Command="Delete"
                                    CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Images/Delete16.png" />
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="./../Images/Delete16.png" />
                            </Button>
                         </StackPanel>
                      </Grid>
@@ -114,7 +121,8 @@
                                          Margin="0,5,0,0"
                                          HorizontalAlignment="Stretch"
                                          VerticalAlignment="Stretch"
-                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                         IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" />
                      </Grid>
                   </Grid>
                </Border>
@@ -149,6 +157,7 @@
                                           Padding="{TemplateBinding Padding}"
                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           IsOpen="{TemplateBinding IsOpen}"
+                                          IsReadOnly="{TemplateBinding IsReadOnly}"
                                           Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
             </ControlTemplate>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
index b734f91fd..0417d9b77 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index d71035e19..fe4ba30df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..1f916904e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,319 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvasTextBox (Style)                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Background" Value="Transparent" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="False">
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- SliderRepeatButton (Style)                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style x:Key="SliderRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border Background="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- VerticalSlideThumb (Template and Style)                                         -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="VerticalSlideThumbTemplate" TargetType="{x:Type Thumb}">
+        <Canvas SnapsToDevicePixels="true">
+            <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform Y="6" X="-3" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+            <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform />
+                        <SkewTransform />
+                        <RotateTransform Angle="-180" />
+                        <TranslateTransform Y="6" X="8" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+        </Canvas>
+    </ControlTemplate>
+
+    <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Height" Value="12" />
+        <Setter Property="Width" Value="11" />
+        <Setter Property="Foreground" Value="Gray" />
+        <Setter Property="Template" Value="{StaticResource VerticalSlideThumbTemplate}" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorSpectrumSlider (Template and Style)                                        -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="ColorSpectrumSliderTemplate" TargetType="{x:Type local:ColorSpectrumSlider}">
+        <Grid>
+            <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+            </Border>
+
+            <Track Name="PART_Track">
+                <Track.DecreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                </Track.DecreaseRepeatButton>
+                <Track.IncreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                </Track.IncreaseRepeatButton>
+                <Track.Thumb>
+                    <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                </Track.Thumb>
+            </Track>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+        <Setter Property="Orientation" Value="Vertical" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Minimum" Value="1" />
+        <Setter Property="Maximum" Value="360" />
+        <Setter Property="TickFrequency" Value="0.001" />
+        <Setter Property="IsSnapToTickEnabled" Value="True" />
+        <Setter Property="IsDirectionReversed" Value="False" />
+        <Setter Property="IsMoveToPointEnabled" Value="True" />
+        <Setter Property="Value" Value="0" />
+        <Setter Property="Template" Value="{StaticResource ColorSpectrumSliderTemplate}" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvas (Template and Style)                                                -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="ColorCanvasTemplate" TargetType="{x:Type local:ColorCanvas}">
+        <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+            <Grid Margin="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions >
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                        <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                            <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                            <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                        <GradientStop Offset="0" Color="#ffffffff" />
+                                        <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                        <GradientStop Offset="0" Color="#ff000000" />
+                                        <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                            </Canvas>
+                        </Canvas>
+                    </Border>
+
+                    <Border Grid.Row="1" Margin="0,5,0,0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                            </Border>
+                            <TextBox x:Name="PART_HexadecimalTextBox" Grid.Column="1" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                        </Grid>
+                    </Border>
+
+                    <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                        <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                    </Border>
+                </Grid>
+
+                <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center"
+                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center"
+                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
+                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:ColorCanvas}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template" Value="{StaticResource ColorCanvasTemplate}" />
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index b4d3d7696..00b6b58cd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -1,24 +1,28 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
+   <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
@@ -38,26 +42,6 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
 
-   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-      <DrawingBrush.Drawing>
-         <DrawingGroup>
-            <GeometryDrawing Brush="White">
-               <GeometryDrawing.Geometry>
-                  <RectangleGeometry Rect="0,0 100,100" />
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-            <GeometryDrawing Brush="LightGray">
-               <GeometryDrawing.Geometry>
-                  <GeometryGroup>
-                     <RectangleGeometry Rect="0,0 50,50" />
-                     <RectangleGeometry Rect="50,50 50,50" />
-                  </GeometryGroup>
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-         </DrawingGroup>
-      </DrawingBrush.Drawing>
-   </DrawingBrush>
-
    <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
 
    <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
index b851ab0f7..c11af4ee7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Media;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index 0a53b045c..a8422c7c9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..8709a7cf6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,291 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="ToolTip" Value="{Binding Name}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Grid ToolTip="{Binding Name}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="ColorItemTemplate">
+        <Grid>
+            <Border Background="{StaticResource CheckerBrush}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1" Margin="2,2,2,2" >
+                <Rectangle Width="14" Height="14">
+                    <Rectangle.Style>
+                        <Style TargetType="Rectangle">
+                            <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                        </Style>
+                    </Rectangle.Style>
+                </Rectangle>
+            </Border>
+        </Grid>
+    </DataTemplate>
+
+    <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                                <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                            </Border>
+
+                            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0"
+                                          Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+										  RenderMouseOver="{TemplateBinding IsMouseOver}"
+										  RenderPressed="{TemplateBinding IsPressed}">
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </chrome:ButtonChrome>
+                        </Grid>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+     <Style x:Key="ColorDisplayStyle" TargetType="ContentControl">
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <Border Background="{StaticResource CheckerBrush}">
+                  <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+               </Border>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+    <Style x:Key="ColorListStyle" TargetType="ListBox">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <WrapPanel Width="200" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+        <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+        <Setter Property="SelectionMode" Value="Single" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorPicker                                                                     -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:ColorPicker}">
+        <Setter Property="Background" Value="White" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+                    <Grid>
+                        <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                            <Grid Margin="2">
+                                <ContentControl x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                                <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                                    <StackPanel Orientation="Horizontal">
+                                        <ContentControl HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+                                        <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </ToggleButton>
+
+                        <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+
+                                        <!-- Available Colors -->
+                                        <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                                <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+
+                                        <!-- Standard Colors-->
+                                        <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                                <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+
+                                        <!-- Recent Colors-->
+                                        <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                                <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+                                    </Grid>
+
+                                    <!-- ColorCanvas -->
+                                    <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                                        <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </Grid>
+
+                                    <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                                    <!-- More Colors Button -->
+                                    <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                </Grid>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="DisplayColorAndName" Value="True">
+                            <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                            <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                            <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index 001916d26..3b506b199 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -20,6 +20,10 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
    <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
    <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
    <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
@@ -50,26 +54,6 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
 
-   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-      <DrawingBrush.Drawing>
-         <DrawingGroup>
-            <GeometryDrawing Brush="White">
-               <GeometryDrawing.Geometry>
-                  <RectangleGeometry Rect="0,0 100,100" />
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-            <GeometryDrawing Brush="LightGray">
-               <GeometryDrawing.Geometry>
-                  <GeometryGroup>
-                     <RectangleGeometry Rect="0,0 50,50" />
-                     <RectangleGeometry Rect="50,50 50,50" />
-                  </GeometryGroup>
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-         </DrawingGroup>
-      </DrawingBrush.Drawing>
-   </DrawingBrush>
-
    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
       <Setter Property="ToolTip" Value="{Binding Name}" />
       <Setter Property="Template">
@@ -98,16 +82,11 @@
 
    <DataTemplate x:Key="ColorItemTemplate">
       <Grid>
-         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+         <Border Background="{StaticResource CheckerBrush}" BorderBrush="Black" BorderThickness="1" Margin="2,2,2,2" >
             <Rectangle Width="14" Height="14">
                <Rectangle.Style>
                   <Style TargetType="Rectangle">
                      <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
-                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
-                        </DataTrigger>
-                     </Style.Triggers>
                   </Style>
                </Rectangle.Style>
             </Rectangle>
@@ -161,13 +140,16 @@
       </Setter>
    </Style>
 
-   <Style x:Key="ColorDisplayStyle" TargetType="Border">
-      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
-            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
-         </DataTrigger>
-      </Style.Triggers>
+   <Style x:Key="ColorDisplayStyle" TargetType="ContentControl">
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <Border Background="{StaticResource CheckerBrush}">
+                  <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+               </Border>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
    </Style>
 
    <Style x:Key="ColorListStyle" TargetType="ListBox">
@@ -210,11 +192,11 @@
                                 IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                                 Style="{TemplateBinding ButtonStyle}">
                      <Grid Margin="2">
-                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+                        <ContentControl x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
 
                         <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
                            <StackPanel Orientation="Horizontal">
-                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <ContentControl HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
                               <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
                            </StackPanel>
                         </Border>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
new file mode 100644
index 000000000..d58c61e50
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
@@ -0,0 +1,59 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void CancelRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+  /// <summary>
+  /// An event data class that allows to inform the sender that the handler wants to cancel
+  /// the ongoing action.
+  /// 
+  /// The handler can set the "Cancel" property to false to cancel the action.
+  /// </summary>
+  public class CancelRoutedEventArgs : RoutedEventArgs
+  {
+    public CancelRoutedEventArgs()
+      : base()
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent )
+      : base( routedEvent )
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent, object source )
+      : base( routedEvent, source )
+    {
+    }
+
+    #region Cancel Property
+
+    public bool Cancel
+    {
+      get;
+      set;
+    }
+
+    #endregion Cancel Property
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
new file mode 100644
index 000000000..cda549e12
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class BorderThicknessToStrokeThicknessConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Thickness thickness = ( Thickness )value;
+      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int? thick = ( int? )value;
+      int thickValue = thick.HasValue ? thick.Value : 0;
+
+      return new Thickness( thickValue, thickValue, thickValue, thickValue );
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
index c59a1a852..5d8ff3756 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
new file mode 100644
index 000000000..4b484a137
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -0,0 +1,82 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  /// <summary>
+  /// This converter allow to blend two colors into one based on a specified ratio
+  /// </summary>
+  public class ColorBlendConverter : IValueConverter
+  {
+    private double _blendedColorRatio = 0;
+
+    /// <summary>
+    /// The ratio of the blended color. Must be between 0 and 1.
+    /// </summary>
+    public double BlendedColorRatio
+    {
+      get { return _blendedColorRatio; }
+
+      set
+      {
+        if( value < 0d || value > 1d )
+          throw new ArgumentException( "BlendedColorRatio must greater than or equal to 0 and lower than or equal to 1 " );
+
+        _blendedColorRatio = value;
+      }
+    }
+
+    /// <summary>
+    /// The color to blend with the source color
+    /// </summary>
+    public Color BlendedColor { get; set; }
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null || value.GetType() != typeof( Color ) )
+        return null;
+
+      Color color = ( Color )value;
+      return new Color()
+      {
+        A = this.BlendValue( color.A, this.BlendedColor.A ),
+        R = this.BlendValue( color.R, this.BlendedColor.R ),
+        G = this.BlendValue( color.G, this.BlendedColor.G ),
+        B = this.BlendValue( color.B, this.BlendedColor.B )
+      };
+    }
+
+    private byte BlendValue( byte original, byte blend )
+    {
+      double blendRatio = this.BlendedColorRatio;
+      double sourceRatio = 1 - blendRatio;
+
+      double result = ( ( ( double )original ) * sourceRatio ) + ( ( ( double )blend ) * blendRatio );
+      result = Math.Round( result );
+      result = Math.Min( 255d, Math.Max( 0d, result ) );
+      return System.Convert.ToByte( result );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
index e69569a13..efe72b021 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
index b4df59852..56a6d0c2c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
index 5bf381051..7020084e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
index 5a5359326..ed3c07f83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
index e4bc5196e..8a62ec7f7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
index 2eca58e8d..103512841 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
index 1e11e0470..e535f3b09 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
new file mode 100644
index 000000000..e09d4cffc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
@@ -0,0 +1,67 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  /// <summary>
+  /// Sets the margin for the thumb grip, the top buttons, or for the content border in the WindowControl.
+  /// </summary>
+  public class WindowContentBorderMarginConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+      double horizontalContentBorderOffset = ( double )values[ 0 ];
+      double verticalContentBorderOffset = ( double )values[ 1 ];
+
+      switch( ( string )parameter )
+      {
+        // Content Border Margin in the WindowControl
+        case "0":
+          return new Thickness( horizontalContentBorderOffset
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , verticalContentBorderOffset );
+        // Thumb Grip Margin in the WindowControl
+        case "1":
+          return new Thickness( 0d
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , verticalContentBorderOffset );
+        // Header Buttons Margin in the WindowControl
+        case "2":
+          return new Thickness( 0d
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , 0d );
+        default:
+          throw new NotSupportedException( "'parameter' for WindowContentBorderMarginConverter is not valid." );
+      }
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
new file mode 100644
index 000000000..1135f2f3e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
@@ -0,0 +1,61 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class WindowControlBackgroundConverter : IMultiValueConverter
+  {
+    /// <summary>
+    /// Used in the WindowContainer Template to calculate the resulting background brush
+    /// from the WindowBackground (values[0]) and WindowOpacity (values[1]) propreties.
+    /// </summary>
+    /// <param name="values"></param>
+    /// <param name="targetType"></param>
+    /// <param name="parameter"></param>
+    /// <param name="culture"></param>
+    /// <returns></returns>
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+      Brush backgroundColor = ( Brush )values[ 0 ];
+      double opacity = ( double )values[ 1 ];
+
+      if( backgroundColor != null )
+      {
+        // Do not override any possible opacity value specifically set by the user.
+        // Only use WindowOpacity value if the user did not set an opacity first.
+        if( backgroundColor.ReadLocalValue( Brush.OpacityProperty ) == System.Windows.DependencyProperty.UnsetValue )
+        {
+          backgroundColor = backgroundColor.Clone();
+          backgroundColor.Opacity = opacity;
+        }
+      }
+      return backgroundColor;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
index 05c21163b..bfec6ea89 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -24,7 +24,13 @@ public class WizardPageButtonVisibilityConverter : IMultiValueConverter
   {
     public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-      Visibility wizardVisibility = ( Visibility )values[ 0 ];
+      if( values == null || values.Length != 2 )
+        throw new ArgumentException( "Wrong number of arguments for WizardPageButtonVisibilityConverter." );
+
+      Visibility wizardVisibility = ( (values[ 0 ] == null) || (values[ 0 ] == DependencyProperty.UnsetValue) )
+                                    ? Visibility.Hidden
+                                    : ( Visibility )values[ 0 ];
+
       WizardPageButtonVisibility wizardPageVisibility = ( (values[ 1 ] == null) || (values[ 1 ] == DependencyProperty.UnsetValue) )
                                                         ? WizardPageButtonVisibility.Hidden
                                                         : ( WizardPageButtonVisibility )values[ 1 ];
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
index 2962f8f45..c44e86f96 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Resources;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
index 755fe58a5..7c3767260 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
index e158b51f2..9a81349f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Core
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
index e3d7c975e..83d0562a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
index 826e0a8e3..bc7c6151a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
index d667cfb14..0e82cf02c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 
 namespace Xceed.Wpf.Toolkit.Core.Input
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
index a8db6eb8d..e1c47a14a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
index d47039103..cec587da1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
index 376021464..793cb9e14 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
index 3cebbc7d3..97fc54bf8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
index 729c67286..3ec7e7bad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
index ec2a02e80..c8b9024f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
index 6e6482df0..1cc8fcb12 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
index d6ce858c3..dbb3d684c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
index f4cf3c588..57f56b0ed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
index b0bce853a..41c3a77a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
index a7d3db9a0..4b7765a6e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
new file mode 100644
index 000000000..7a3f193e7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
@@ -0,0 +1,126 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Media
+{
+  /// <summary>
+  /// Contains system colors and configurations that can be used by the control themes.
+  /// 
+  /// Mainly extracted from the registry because theses values are not exposed by the standard .NET API.
+  /// </summary>
+  public static class WindowColors
+  {
+    private static Color? _colorizationMode;
+    private static bool? _colorizationOpaqueBlend;
+
+    /// <summary>
+    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationColor Registry key.
+    /// 
+    /// Gets the window chrome color.
+    /// </summary>
+    public static Color ColorizationColor
+    {
+      get
+      {
+        if( _colorizationMode.HasValue )
+          return _colorizationMode.Value;
+
+        try
+        {
+          _colorizationMode = WindowColors.GetDWMColorValue( "ColorizationColor" );
+        }
+        catch
+        {
+          // If for any reason (for example, a SecurityException for XBAP apps)
+          // we cannot read the value in the registry, fall back on some color.
+          _colorizationMode = Color.FromArgb(255, 175, 175, 175);
+        }
+
+        return _colorizationMode.Value;
+      }
+    }
+
+    /// <summary>
+    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationOpaqueBlend Registry key:
+    /// 
+    /// Gets whether transparency is disabled.
+    /// 
+    /// Returns true if transparency is disabled; false otherwise.
+    /// </summary>
+    public static bool ColorizationOpaqueBlend
+    {
+      get
+      {
+        if( _colorizationOpaqueBlend.HasValue )
+          return _colorizationOpaqueBlend.Value;
+
+        try
+        {
+          _colorizationOpaqueBlend = WindowColors.GetDWMBoolValue( "ColorizationOpaqueBlend" );
+        }
+        catch
+        {
+          // If for any reason (for example, a SecurityException for XBAP apps)
+          // we cannot read the value in the registry, fall back on some color.
+          _colorizationOpaqueBlend = false;
+        }
+
+        return _colorizationOpaqueBlend.Value;
+      }
+    }
+
+    private static int GetDWMIntValue( string keyName )
+    {
+      // This value is not accessible throught the standard WPF API.
+      // We must dig into the registry to get the value.
+      var curUser = Microsoft.Win32.Registry.CurrentUser;
+      var subKey = curUser.CreateSubKey(
+        @"Software\Microsoft\Windows\DWM",
+        Microsoft.Win32.RegistryKeyPermissionCheck.ReadSubTree
+#if VS2008
+        );
+#else
+        ,Microsoft.Win32.RegistryOptions.None );
+#endif
+      return ( int )subKey.GetValue( keyName );
+    }
+
+    private static Color GetDWMColorValue( string keyName )
+    {
+      int value = WindowColors.GetDWMIntValue( keyName );
+        byte[] bytes = BitConverter.GetBytes( value );
+        return new Color()
+        {
+          B = bytes[ 0 ],
+          G = bytes[ 1 ],
+          R = bytes[ 2 ],
+          A = 255
+        };
+    }
+
+    private static bool GetDWMBoolValue( string keyName )
+    {
+      int value = WindowColors.GetDWMIntValue( keyName );
+      return ( value != 0 );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
index b0e6495d5..d72aaa879 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
index 5952a6a39..e65f57fb2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
index 55efca55f..d8d3e00d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs
new file mode 100644
index 000000000..29d012caf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  /// <summary>
+  /// Specify when the mouse wheel is active.
+  /// </summary>
+  public enum MouseWheelActiveTrigger
+  {
+    Focused,
+    MouseOver,
+    Disabled
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
index b0afdbba4..6aaa50da2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -682,6 +682,7 @@ public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
         else if( object.ReferenceEquals( ItemsCollection, sender ) )
         {
           this.OnItemsSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+          return true;
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
index b3c4c7ee2..117ad4547 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
index 18ab741a6..ccddcb5ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
index 291cf3f74..12c4ef285 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -109,21 +109,62 @@ private void OnDefaultValueChanged( T oldValue, T newValue )
 
     #endregion //DefaultValue
 
+    #region MouseWheelActiveTrigger
+
+    /// <summary>
+    /// Identifies the MouseWheelActiveTrigger dependency property
+    /// </summary>
+    public static readonly DependencyProperty MouseWheelActiveTriggerProperty = DependencyProperty.Register( "MouseWheelActiveTrigger", typeof( MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( MouseWheelActiveTrigger.Focused ) );
+
+    /// <summary>
+    /// Get or set when the mouse wheel event should affect the value.
+    /// </summary>
+    public MouseWheelActiveTrigger MouseWheelActiveTrigger
+    {
+      get
+      {
+        return ( MouseWheelActiveTrigger )GetValue( MouseWheelActiveTriggerProperty );
+      }
+      set
+      {
+        SetValue( MouseWheelActiveTriggerProperty, value );
+      }
+    }
+
+    #endregion //MouseWheelActiveTrigger
+
+
     #region MouseWheelActiveOnFocus
 
-    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    [Obsolete("Use MouseWheelActiveTrigger property instead")]
+    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true, OnMouseWheelActiveOnFocusChanged ) );
+
+    [Obsolete( "Use MouseWheelActiveTrigger property instead" )]
     public bool MouseWheelActiveOnFocus
     {
       get
       {
+#pragma warning disable 618
         return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
+#pragma warning restore 618
       }
       set
       {
+#pragma warning disable 618
         SetValue( MouseWheelActiveOnFocusProperty, value );
+#pragma warning restore 618
       }
     }
 
+    private static void OnMouseWheelActiveOnFocusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      UpDownBase<T> upDownBase = o as UpDownBase<T>;
+      if( upDownBase != null )
+        upDownBase.MouseWheelActiveTrigger = (( bool )e.NewValue) 
+          ? MouseWheelActiveTrigger.Focused
+          : MouseWheelActiveTrigger.MouseOver;
+    }
+
     #endregion //MouseWheelActiveOnFocus
 
     #region ShowButtonSpinner
@@ -234,33 +275,6 @@ public override void OnApplyTemplate()
       SetValidSpinDirection();
     }
 
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      if( TextBox != null )
-        TextBox.Focus();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Up:
-          {
-            if( AllowSpin && !IsReadOnly )
-              DoIncrement();
-            e.Handled = true;
-            break;
-          }
-        case Key.Down:
-          {
-            if( AllowSpin && !IsReadOnly )
-              DoDecrement();
-            e.Handled = true;
-            break;
-          }
-      }
-    }
-
     protected override void OnKeyDown( KeyEventArgs e )
     {
       switch( e.Key )
@@ -276,25 +290,6 @@ protected override void OnKeyDown( KeyEventArgs e )
       }
     }
 
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      base.OnMouseWheel( e );
-
-      if( !e.Handled && AllowSpin && !IsReadOnly && ( TextBox.IsFocused && MouseWheelActiveOnFocus ) )
-      {
-        if( e.Delta < 0 )
-        {
-          DoDecrement();
-        }
-        else if( 0 < e.Delta )
-        {
-          DoIncrement();
-        }
-
-        e.Handled = true;
-      }
-    }
-
     protected override void OnTextChanged( string oldValue, string newValue )
     {
       if( this.IsInitialized )
@@ -323,7 +318,17 @@ protected override void OnReadOnlyChanged( bool oldValue, bool newValue )
     private void OnSpinnerSpin( object sender, SpinEventArgs e )
     {
       if( AllowSpin && !IsReadOnly )
-        OnSpin( e );
+      {
+        var activeTrigger = this.MouseWheelActiveTrigger;
+        bool spin = !e.UsingMouseWheel;
+        spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver);
+        spin |= ( TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.Focused ) );
+
+        if( spin )
+        {
+          OnSpin( e );
+        }
+      }
     }
 
     #endregion //Event Handlers
@@ -369,14 +374,20 @@ protected override void OnInitialized( EventArgs e )
     {
       base.OnInitialized( e );
       // When both Value and Text are initialized, Value has priority.
-      bool updateValueFromText = ( this.Value == null );
-      this.SyncTextAndValueProperties( updateValueFromText, Text );
+      // To be sure that the value is not initialized, it should
+      // have no local value, no binding, and equal to the default value.
+      bool updateValueFromText =
+        ( this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue )
+        && ( BindingOperations.GetBinding( this, ValueProperty ) == null )
+        && ( object.Equals(this.Value, ValueProperty.DefaultMetadata.DefaultValue) );
+
+      this.SyncTextAndValueProperties( updateValueFromText, Text, !updateValueFromText );
     }
 
     /// <summary>
     /// Performs an increment if conditions allow it.
     /// </summary>
-    private void DoDecrement()
+    internal void DoDecrement()
     {
       if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
       {
@@ -387,7 +398,7 @@ private void DoDecrement()
     /// <summary>
     /// Performs a decrement if conditions allow it.
     /// </summary>
-    private void DoIncrement()
+    internal void DoIncrement()
     {
       if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
       {
@@ -431,7 +442,12 @@ public bool CommitInput()
       return this.SyncTextAndValueProperties( true, Text );
     }
 
-    protected bool SyncTextAndValueProperties(bool updateValueFromText, string text )
+    protected bool SyncTextAndValueProperties( bool updateValueFromText, string text )
+    {
+      return this.SyncTextAndValueProperties( updateValueFromText, text, false );
+    }
+
+    private bool SyncTextAndValueProperties(bool updateValueFromText, string text, bool forceTextUpdate )
     {
       if( _isSyncingTextAndValueProperties )
         return true;
@@ -472,8 +488,8 @@ protected bool SyncTextAndValueProperties(bool updateValueFromText, string text
         if(!_isTextChangedFromUI)
         {
           // Don't replace the empty Text with the non-empty representation of DefaultValue.
-          bool shouldKeepEmpty = string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue );
-          if( !shouldKeepEmpty )
+          bool shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue );
+          if(  !shouldKeepEmpty )
           {
             Text = ConvertValueToText();
           }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
index 4875440fd..47d287959 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs
new file mode 100644
index 000000000..3c483c51e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs
@@ -0,0 +1,415 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.ComponentModel;
+using System.Windows.Input;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class WindowContainer : Canvas
+  {
+    #region Constructors
+
+    static WindowContainer()
+    {
+      // The default background must be transparent in order to be able to trap
+      // all mouse events when a modal window is displayed.
+      var defaultModalBackgroundBrush = new SolidColorBrush( Colors.Transparent );
+      defaultModalBackgroundBrush.Freeze();
+      ModalBackgroundBrushProperty = DependencyProperty.Register( "ModalBackgroundBrush", typeof( Brush ), typeof( WindowContainer ), new UIPropertyMetadata( defaultModalBackgroundBrush, OnModalBackgroundBrushChanged ) );
+    }
+
+
+    public WindowContainer()
+    {
+      this.SizeChanged += new SizeChangedEventHandler( this.WindowContainer_SizeChanged );
+      this.LayoutUpdated += new EventHandler( this.WindowContainer_LayoutUpdated );
+      this.Loaded += new RoutedEventHandler( WindowContainer_Loaded );
+      this.ClipToBounds = true;
+    }
+
+    void WindowContainer_Loaded( object sender, RoutedEventArgs e )
+    {
+      this.SetNextActiveWindow( null );
+    }
+
+    #endregion //Constructors
+
+    #region Members
+
+    private Brush _defaultBackgroundBrush;
+    private bool _isModalBackgroundApplied;
+
+    #endregion
+
+    #region Properties
+
+    #region ModalBackgroundBrush
+
+    /// <summary>
+    /// Identifies the ModalBackgroundBrush dependency property.
+    /// </summary>
+    // Initialized in the static constructor.
+    public static readonly DependencyProperty ModalBackgroundBrushProperty;
+
+    /// <summary>
+    /// When using a modal window in the WindowContainer, a ModalBackgroundBrush can be set
+    /// for the WindowContainer.
+    /// </summary>
+    public Brush ModalBackgroundBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( ModalBackgroundBrushProperty );
+      }
+      set
+      {
+        SetValue( ModalBackgroundBrushProperty, value );
+      }
+    }
+
+    private static void OnModalBackgroundBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      WindowContainer windowContainer = ( WindowContainer )d;
+      if( windowContainer != null )
+        windowContainer.OnModalBackgroundBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
+    }
+
+    protected virtual void OnModalBackgroundBrushChanged( Brush oldValue, Brush newValue )
+    {
+      this.SetModalBackground();
+    }
+
+    #endregion //ModalBackgroundBrush
+
+    #endregion
+
+    #region Base Class Override
+
+    /// <summary>
+    /// Measure the size of the WindowContainer based on its children.
+    /// </summary>
+    protected override Size MeasureOverride( Size constraint )
+    {
+      Size size = base.MeasureOverride( constraint );
+
+      if( this.Children.Count > 0 )
+      {
+        double width = double.IsNaN( this.Width )
+                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Left + w.DesiredSize.Width )
+                        : this.Width;
+        double height = double.IsNaN( this.Height )
+                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Top + w.DesiredSize.Height )
+                        : this.Height;
+        return new Size( Math.Min( width, constraint.Width), Math.Min( height, constraint.Height) );
+      }
+
+      return size;
+    }
+
+    /// <summary>
+    /// Register and unregister to children events.
+    /// </summary>
+    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
+    {
+      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
+
+      if( visualAdded != null && !( visualAdded is WindowControl ) )
+        throw new InvalidOperationException( "WindowContainer can only contain WindowControl types." );
+
+      if( visualRemoved != null )
+      {
+        WindowControl removedChild = ( WindowControl )visualRemoved;
+        removedChild.LeftChanged -= new EventHandler<EventArgs>( this.Child_LeftChanged );
+        removedChild.TopChanged -= new EventHandler<EventArgs>( this.Child_TopChanged );
+        removedChild.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
+        removedChild.IsVisibleChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
+        removedChild.IsKeyboardFocusWithinChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
+        if( removedChild is ChildWindow )
+        {
+          ( ( ChildWindow )removedChild ).IsModalChanged -= new EventHandler<EventArgs>( this.Child_IsModalChanged );
+        }
+      }
+
+      if( visualAdded != null )
+      {
+        WindowControl addedChild = ( WindowControl )visualAdded;
+        addedChild.LeftChanged += new EventHandler<EventArgs>( this.Child_LeftChanged );
+        addedChild.TopChanged += new EventHandler<EventArgs>( this.Child_TopChanged );
+        addedChild.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
+        addedChild.IsVisibleChanged += new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
+        addedChild.IsKeyboardFocusWithinChanged += new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
+        if( addedChild is ChildWindow )
+        {
+          ( ( ChildWindow )addedChild ).IsModalChanged += new EventHandler<EventArgs>( this.Child_IsModalChanged );
+        }
+      }
+    }
+
+    #endregion
+
+    #region Event Handler
+
+
+
+    private void Child_LeftChanged( object sender, EventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( windowControl != null )
+      {
+        windowControl.Left = this.GetRestrictedLeft( windowControl );
+      }
+
+      Canvas.SetLeft( windowControl, windowControl.Left );
+    }
+
+    private void Child_TopChanged( object sender, EventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( windowControl != null )
+      {
+        windowControl.Top = this.GetRestrictedTop( windowControl );
+      }
+
+      Canvas.SetTop( windowControl, windowControl.Top );
+    }
+
+    private void Child_PreviewMouseLeftButtonDown( object sender, RoutedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      this.SetNextActiveWindow( windowControl );
+    }
+
+    private void Child_IsModalChanged( object sender, EventArgs e )
+    {
+      this.SetModalBackground();
+    }
+
+    private void Child_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+
+      //Do not give access to data behind the WindowContainer as long as any child of WindowContainer is visible.
+      WindowControl firstVisibleChild = this.Children.OfType<WindowControl>().FirstOrDefault( ( x ) => x.Visibility == Visibility.Visible );
+      this.IsHitTestVisible = ( firstVisibleChild != null );
+
+      if( ( bool )e.NewValue )
+      {
+        this.SetChildPos( windowControl );
+        this.SetNextActiveWindow( windowControl );
+      }
+      else
+      {
+        this.SetNextActiveWindow( null );
+      }
+
+      WindowControl modalWindow = this.GetModalWindow();
+      foreach( WindowControl window in this.Children )
+      {
+        window.IsBlockMouseInputsPanelActive = ( modalWindow != null ) && !object.Equals( modalWindow, window );
+      }
+
+      this.SetModalBackground();
+    }
+
+    private void Child_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( ( bool )e.NewValue )
+      {
+        this.SetNextActiveWindow( windowControl );
+      }
+    }
+
+    private void WindowContainer_LayoutUpdated( object sender, EventArgs e )
+    {
+      foreach( WindowControl windowControl in this.Children )
+      {
+        //we only want to set the start position if this is the first time the control has bee initialized
+        if( !windowControl.IsStartupPositionInitialized && ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
+        {
+          this.SetChildPos( windowControl );
+          windowControl.IsStartupPositionInitialized = true;
+        }
+      }
+    }
+
+    private void WindowContainer_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      foreach( WindowControl windowControl in this.Children )
+      {
+        //reposition our windows
+        windowControl.Left = this.GetRestrictedLeft( windowControl );
+        windowControl.Top = this.GetRestrictedTop( windowControl );
+      }
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private void SetChildPos( WindowControl windowControl )
+    {
+      // A MessageBox with no X and Y will be centered.
+      // A ChildWindow with WindowStartupLocation == Center will be centered.
+      if( ( ( windowControl is MessageBox ) && ( windowControl.Left == 0 ) && ( windowControl.Top == 0 ) )
+        || ( ( windowControl is ChildWindow ) && ( ( ( ChildWindow )windowControl ).WindowStartupLocation == WindowStartupLocation.Center ) ) )
+      {
+        this.CenterChild( windowControl );
+      }
+      else
+      {
+        Canvas.SetLeft( windowControl, windowControl.Left );
+        Canvas.SetTop( windowControl, windowControl.Top );
+      }
+    }
+
+    private void CenterChild( WindowControl windowControl )
+    {
+      if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
+      {
+        windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
+        windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
+      }
+    }
+
+    private void SetNextActiveWindow( WindowControl windowControl )
+    {
+      if( !this.IsLoaded )
+        return;
+
+      WindowControl modalWindow = this.GetModalWindow();
+      // Modal window is always in front
+      if( modalWindow != null )
+      {
+        this.BringToFront( modalWindow );
+      }
+      else if( windowControl != null )
+      {
+        this.BringToFront( windowControl );
+      }
+      else
+      {
+        this.BringToFront( this.Children.OfType<WindowControl>().FirstOrDefault( (x) => x.Visibility == Visibility.Visible ) );
+      }
+    }
+
+    private void BringToFront( WindowControl windowControl )
+    {
+      if( windowControl != null )
+      {
+        int maxZIndez = this.Children.OfType<WindowControl>().Max( ( x ) => Canvas.GetZIndex( x ) );
+        Canvas.SetZIndex( windowControl, maxZIndez + 1 );
+
+        windowControl.Focus();
+
+        this.SetActiveWindow( windowControl );
+      }
+    }
+
+    private void SetActiveWindow( WindowControl windowControl )
+    {
+      foreach( WindowControl window in this.Children )
+      {
+        window.SetIsActiveInternal( false );
+      }
+      windowControl.SetIsActiveInternal( true );
+    }
+
+    private bool IsModalWindow( WindowControl windowControl )
+    {
+      return ( ( windowControl is MessageBox )
+             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal ) );
+    }
+
+    private WindowControl GetModalWindow()
+    {
+      return this.Children.OfType<WindowControl>()
+                      .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
+                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) );
+    }
+
+    private double GetRestrictedLeft( WindowControl windowControl )
+    {
+      if( windowControl.Left < 0 )
+        return 0;
+
+      if( ( ( windowControl.Left + windowControl.ActualWidth ) > this.ActualWidth ) && ( this.ActualWidth != 0 ) )
+      {
+        double x = this.ActualWidth - windowControl.ActualWidth;
+        return x < 0 ? 0 : x;
+      }
+
+      return windowControl.Left;
+    }
+
+    private double GetRestrictedTop( WindowControl windowControl )
+    {
+      if( windowControl.Top < 0 )
+        return 0;
+
+      if( ( ( windowControl.Top + windowControl.ActualHeight ) > this.ActualHeight ) && ( this.ActualHeight != 0 ) )
+      {
+        double y = this.ActualHeight - windowControl.ActualHeight;
+        return y < 0 ? 0 : y;
+      }
+
+      return windowControl.Top;
+    }
+
+    private void SetModalBackground()
+    {
+      // We have a modal window and a ModalBackgroundBrush set.
+      if( ( this.GetModalWindow() != null ) && ( this.ModalBackgroundBrush != null ) )
+      {
+        if( !_isModalBackgroundApplied )
+        {
+          _defaultBackgroundBrush = this.Background;
+          _isModalBackgroundApplied = true;
+        }
+
+        this.Background = this.ModalBackgroundBrush;
+
+      }
+      else
+      {
+        if( _isModalBackgroundApplied )
+        {
+          this.Background = _defaultBackgroundBrush;
+          _defaultBackgroundBrush = null;
+          _isModalBackgroundApplied = false;
+        }
+      }
+    }
+
+
+
+
+
+    #endregion
+  }
+
+
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs
new file mode 100644
index 000000000..6df44225d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs
@@ -0,0 +1,817 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.IO;
+using Xceed.Wpf.Toolkit.Core;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  [TemplatePart( Name = PART_HeaderThumb, Type = typeof( Thumb ) )]
+  [TemplatePart( Name = PART_Icon, Type = typeof( Image ) )]
+  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]  
+  [TemplatePart( Name = PART_ToolWindowCloseButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_BlockMouseInputsBorder, Type = typeof( Border ) )]
+  [TemplatePart( Name = PART_HeaderGrid, Type = typeof( Grid ) )]
+  public class WindowControl : ContentControl
+  {
+    public static readonly ComponentResourceKey DefaultCloseButtonStyleKey = new ComponentResourceKey( typeof( WindowControl ), "DefaultCloseButtonStyle" );
+
+    private const string PART_HeaderThumb = "PART_HeaderThumb";
+    private const string PART_Icon = "PART_Icon";
+    private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_ToolWindowCloseButton = "PART_ToolWindowCloseButton";
+    private const string PART_BlockMouseInputsBorder = "PART_BlockMouseInputsBorder";
+    private const string PART_HeaderGrid = "PART_HeaderGrid";
+
+    #region Members
+
+    private Thumb _headerThumb;
+    private Image _icon;
+    private Button _closeButton;
+    private Button _windowToolboxCloseButton;
+    private bool _setIsActiveInternal;
+    internal Border _windowBlockMouseInputsPanel;
+
+    #endregion
+
+    #region Constructors
+
+    static WindowControl()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WindowControl ), new FrameworkPropertyMetadata( typeof( WindowControl ) ) );
+    }
+
+    public WindowControl()
+    {
+    }
+
+    #endregion //Constructors
+
+    #region Dependency Properties
+
+    #region Public DP
+
+    #region Caption
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( WindowControl ), new UIPropertyMetadata( String.Empty ) );
+    public string Caption
+    {
+      get
+      {
+        return ( string )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    #endregion //Caption
+
+    #region CaptionForeground
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    #endregion //CaptionForeground
+
+    #region CaptionShadowBrush
+
+    public static readonly DependencyProperty CaptionShadowBrushProperty = DependencyProperty.Register( "CaptionShadowBrush", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( new SolidColorBrush( Color.FromArgb( 179, 255, 255, 255 ) ) ) );
+    public Brush CaptionShadowBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionShadowBrushProperty );
+      }
+      set
+      {
+        SetValue( CaptionShadowBrushProperty, value );
+      }
+    }
+
+    #endregion //CaptionShadowBrush
+
+    #region CaptionIcon
+
+    public static readonly DependencyProperty CaptionIconProperty = DependencyProperty.Register( "CaptionIcon", typeof( ImageSource ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public ImageSource CaptionIcon
+    {
+      get
+      {
+        return ( ImageSource )GetValue( CaptionIconProperty );
+      }
+      set
+      {
+        SetValue( CaptionIconProperty, value );
+      }
+    }
+
+    #endregion //CaptionIcon
+
+    #region CloseButtonStyle
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonStyle
+
+    #region CloseButtonVisibility
+
+    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( WindowControl ), new PropertyMetadata( Visibility.Visible, null, OnCoerceCloseButtonVisibility ) );
+    public Visibility CloseButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
+    }
+
+    private static object OnCoerceCloseButtonVisibility( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      WindowControl windowControl = d as WindowControl;
+      if( windowControl == null )
+        return basevalue;
+      return windowControl.OnCoerceCloseButtonVisibility( ( Visibility )basevalue );
+    }
+
+    protected virtual object OnCoerceCloseButtonVisibility( Visibility newValue )
+    {
+      return newValue;
+    }
+
+    #endregion //CloseButtonVisibility
+
+    #region IsActive
+
+    public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register( "IsActive", typeof( bool ), typeof( WindowControl ), new UIPropertyMetadata( true, null, OnCoerceIsActive ) );
+    public bool IsActive
+    {
+      get
+      {
+        return ( bool )GetValue( IsActiveProperty );
+      }
+      set
+      {
+        SetValue( IsActiveProperty, value );
+      }
+    }
+
+    private static object OnCoerceIsActive( DependencyObject d, object basevalue )
+    {
+      WindowControl w = d as WindowControl;
+      if( w != null && !w._setIsActiveInternal && !w.AllowPublicIsActiveChange )
+        throw new InvalidOperationException( "Cannot set IsActive directly. This is handled by the underlying system" );
+
+      return basevalue;
+    }
+
+    internal void SetIsActiveInternal( bool isActive )
+    {
+      _setIsActiveInternal = true;
+      this.IsActive = isActive;
+      _setIsActiveInternal = false;
+    }
+
+    #endregion //IsActive
+
+
+
+
+
+
+
+
+
+    #region Left
+
+    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ), OnCoerceLeft ) );
+    public double Left
+    {
+      get
+      {
+        return ( double )GetValue( LeftProperty );
+      }
+      set
+      {
+        SetValue( LeftProperty, value );
+      }
+    }
+
+    private static object OnCoerceLeft( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      var windowControl = ( WindowControl )d;
+      if( windowControl == null )
+        return basevalue;
+
+      return windowControl.OnCoerceLeft( basevalue );
+    }
+
+    private object OnCoerceLeft( object newValue )
+    {
+      var value = ( double )newValue;
+      if( object.Equals( value, double.NaN ) )
+        return 0.0;
+
+      return newValue;
+    }
+
+    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = obj as WindowControl;
+      if( windowControl != null )
+        windowControl.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    internal event EventHandler<EventArgs> LeftChanged;
+
+    protected virtual void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      EventHandler<EventArgs> handler = LeftChanged;
+      if( handler != null )
+      {
+        handler( this, EventArgs.Empty );
+      }
+    }
+
+    #endregion //Left
+
+    #region Top
+
+    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ), OnCoerceTop ) );
+    public double Top
+    {
+      get
+      {
+        return ( double )GetValue( TopProperty );
+      }
+      set
+      {
+        SetValue( TopProperty, value );
+      }
+    }
+
+    private static object OnCoerceTop( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      var windowControl = ( WindowControl )d;
+      if( windowControl == null )
+        return basevalue;
+
+      return windowControl.OnCoerceTop( basevalue );
+    }
+
+    private object OnCoerceTop( object newValue )
+    {
+      var value = ( double )newValue;
+      if( object.Equals( value, double.NaN ) )
+        return 0.0;
+
+      return newValue;
+    }
+
+    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = obj as WindowControl;
+      if( windowControl != null )
+        windowControl.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    internal event EventHandler<EventArgs> TopChanged;
+
+    protected virtual void OnTopPropertyChanged( double oldValue, double newValue )
+    {
+      EventHandler<EventArgs> handler = TopChanged;
+      if( handler != null )
+      {
+        handler( this, EventArgs.Empty );
+      }
+    }
+
+    #endregion //TopProperty
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    #region WindowBackground
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    #endregion // WindowBackground
+
+    #region WindowBorderBrush
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderBrush
+
+    #region WindowBorderThickness
+
+    public static readonly DependencyProperty WindowBorderThicknessProperty = DependencyProperty.Register( "WindowBorderThickness", typeof( Thickness ), typeof( WindowControl ), new PropertyMetadata( new Thickness( 0 ) ) );
+    public Thickness WindowBorderThickness
+    {
+      get
+      {
+        return ( Thickness )GetValue( WindowBorderThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderThicknessProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderThickness
+
+    #region WindowInactiveBackground
+
+    public static readonly DependencyProperty WindowInactiveBackgroundProperty = DependencyProperty.Register( "WindowInactiveBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowInactiveBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowInactiveBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowInactiveBackgroundProperty, value );
+      }
+    }
+
+    #endregion // WindowInactiveBackground
+
+    #region WindowOpacity
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 1d ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    #endregion //WindowOpacity
+
+    #region WindowStyle
+
+    public static readonly DependencyProperty WindowStyleProperty = DependencyProperty.Register( "WindowStyle", typeof( WindowStyle ), typeof( WindowControl ), new PropertyMetadata( WindowStyle.SingleBorderWindow, null, OnCoerceWindowStyle ) );
+    public WindowStyle WindowStyle
+    {
+      get
+      {
+        return ( WindowStyle )GetValue( WindowStyleProperty );
+      }
+      set
+      {
+        SetValue( WindowStyleProperty, value );
+      }
+    }
+
+    private static object OnCoerceWindowStyle( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      WindowControl windowControl = d as WindowControl;
+      if( windowControl == null )
+        return basevalue;
+      return windowControl.OnCoerceWindowStyle( ( WindowStyle )basevalue );
+    }
+
+    protected virtual object OnCoerceWindowStyle( WindowStyle newValue )
+    {
+      return newValue;
+    }
+
+    private static void OnWindowStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl window = ( WindowControl )d;
+      if( window != null )
+        window.OnWindowStyleChanged( ( WindowStyle )e.OldValue, ( WindowStyle )e.NewValue );
+    }
+
+    protected virtual void OnWindowStyleChanged( WindowStyle oldValue, WindowStyle newValue )
+    {
+    }
+
+    #endregion //WindowStyle  
+
+    #region WindowThickness
+
+    public static readonly DependencyProperty WindowThicknessProperty = DependencyProperty.Register( "WindowThickness", typeof( Thickness ), typeof( WindowControl ),
+                                                                        new PropertyMetadata( new Thickness( SystemParameters.ResizeFrameVerticalBorderWidth - 3,
+                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3,
+                                                                                                            SystemParameters.ResizeFrameVerticalBorderWidth - 3,
+                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3 ) ) );
+    public Thickness WindowThickness
+    {
+      get
+      {
+        return ( Thickness )GetValue( WindowThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowThicknessProperty, value );
+      }
+    }
+
+    #endregion //WindowThickness
+
+    #endregion //Public DP
+
+    #endregion //Dependency Properties
+
+    #region Internal Properties
+
+    internal bool IsStartupPositionInitialized
+    {
+      get;
+      set;
+    }
+
+    #region IsBlockMouseInputsPanelActive (Internal)
+
+    internal bool IsBlockMouseInputsPanelActive
+    {
+      get
+      {
+        return _IsBlockMouseInputsPanelActive;
+      }
+      set
+      {
+        if( value != _IsBlockMouseInputsPanelActive )
+        {
+          _IsBlockMouseInputsPanelActive = value;         
+          this.UpdateBlockMouseInputsPanel();
+        }
+      }
+    }
+
+    private bool _IsBlockMouseInputsPanelActive;
+
+    #endregion
+
+    internal virtual bool AllowPublicIsActiveChange
+    {
+      get { return true; }
+    }
+
+
+    #endregion //Internal Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _headerThumb != null )
+      {
+        _headerThumb.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
+        _headerThumb.PreviewMouseRightButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
+        _headerThumb.DragDelta -= new DragDeltaEventHandler( this.HeaderThumbDragDelta );
+      }
+      _headerThumb = this.Template.FindName( PART_HeaderThumb, this ) as Thumb;
+      if( _headerThumb != null )
+      {
+        _headerThumb.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
+        _headerThumb.PreviewMouseRightButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
+        _headerThumb.DragDelta += new DragDeltaEventHandler( this.HeaderThumbDragDelta );
+      }
+
+      if( _icon != null )
+      {
+        _icon.MouseLeftButtonDown -= new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
+      }
+      _icon = this.Template.FindName( PART_Icon, this ) as Image;
+      if( _icon != null )
+      {
+        _icon.MouseLeftButtonDown += new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
+      }
+
+      if( _closeButton != null )
+      {
+        _closeButton.Click -= new RoutedEventHandler( this.Close );
+      }
+      _closeButton = this.Template.FindName( PART_CloseButton, this ) as Button;
+      if( _closeButton != null )
+      {
+        _closeButton.Click += new RoutedEventHandler( this.Close );
+      }
+
+      if( _windowToolboxCloseButton != null )
+      {
+        _windowToolboxCloseButton.Click -= new RoutedEventHandler( this.Close );
+      }
+      _windowToolboxCloseButton = this.Template.FindName( PART_ToolWindowCloseButton, this ) as Button;
+      if( _windowToolboxCloseButton != null )
+      {
+        _windowToolboxCloseButton.Click += new RoutedEventHandler( this.Close );
+      }
+
+      _windowBlockMouseInputsPanel = this.Template.FindName( PART_BlockMouseInputsBorder, this ) as Border;
+      this.UpdateBlockMouseInputsPanel();
+
+
+
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    #region HeaderMouseLeftButtonClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseLeftButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseLeftButtonClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseLeftButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseLeftButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseLeftButtonClickedEvent
+
+    #region HeaderMouseRightButtonClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseRightButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseRightButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseRightButtonClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseRightButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseRightButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseRightButtonClickedEvent
+
+    #region HeaderMouseLeftButtonDoubleClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseLeftButtonDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseLeftButtonDoubleClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseLeftButtonDoubleClickedEvent
+
+    #region HeaderDragDeltaEvent
+
+    public static readonly RoutedEvent HeaderDragDeltaEvent = EventManager.RegisterRoutedEvent( "HeaderDragDelta", RoutingStrategy.Bubble, typeof( DragDeltaEventHandler ), typeof( WindowControl ) );
+    public event DragDeltaEventHandler HeaderDragDelta
+    {
+      add
+      {
+        AddHandler( HeaderDragDeltaEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderDragDeltaEvent, value );
+      }
+    }
+
+    #endregion //HeaderDragDeltaEvent
+
+    #region HeaderIconClickedEvent
+
+    public static readonly RoutedEvent HeaderIconClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderIconClicked
+    {
+      add
+      {
+        AddHandler( HeaderIconClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderIconClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderIconClickedEvent
+
+    #region HeaderIconDoubleClickedEvent
+
+    public static readonly RoutedEvent HeaderIconDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderIconDoubleClicked
+    {
+      add
+      {
+        AddHandler( HeaderIconDoubleClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderIconDoubleClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderIconDoubleClickedEvent
+
+    #region CloseButtonClickedEvent
+
+    public static readonly RoutedEvent CloseButtonClickedEvent = EventManager.RegisterRoutedEvent( "CloseButtonClicked", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( WindowControl ) );
+    public event RoutedEventHandler CloseButtonClicked
+    {
+      add
+      {
+        AddHandler( CloseButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( CloseButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //CloseButtonClickedEvent
+
+
+
+
+
+
+
+
+
+
+    #endregion //Events
+
+    #region Event Handler
+
+    private void HeaderPreviewMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderMouseLeftButtonDoubleClickedEvent : HeaderMouseLeftButtonClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void HeaderPreviewMouseRightButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Right );
+      args.RoutedEvent = HeaderMouseRightButtonClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void HeaderThumbDragDelta( object sender, DragDeltaEventArgs e )
+    {
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void IconMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderIconDoubleClickedEvent : HeaderIconClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void Close( object sender, RoutedEventArgs e )
+    {
+      this.RaiseEvent( new RoutedEventArgs( CloseButtonClickedEvent, this ) );
+    }
+
+
+
+
+    #endregion // Event Handler
+
+    #region Internal Methods
+
+    internal virtual void UpdateBlockMouseInputsPanel()
+    {
+      if( _windowBlockMouseInputsPanel != null )
+      {
+        _windowBlockMouseInputsPanel.Visibility = this.IsBlockMouseInputsPanelActive ? Visibility.Visible : Visibility.Collapsed;
+      }
+    }
+
+    internal double GetHeaderHeight()
+    {
+      Grid headerGrid = this.Template.FindName( PART_HeaderGrid, this ) as Grid;
+      if( headerGrid != null )
+        return headerGrid.ActualHeight;
+      return 0;
+    }
+
+    #endregion
+
+    #region Private Methods
+
+
+    #endregion //Private Methods
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
index 74cc72968..af1917529 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
index 12967d18d..f05278e75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Core
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
index 9e5b64821..9a5459f77 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
index c6809cc1f..b4c8ea121 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml
new file mode 100644
index 000000000..7d38c7080
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml
@@ -0,0 +1,53 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background" 
+                            Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                  <CheckBox Foreground="{TemplateBinding Foreground}" 
+                                  IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" 
+                                  Content="{TemplateBinding Content}" 
+                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="#FFB8E0F3" />
+                     <Setter TargetName="_background" Property="BorderBrush" Value="#FF26A0DA" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml
new file mode 100644
index 000000000..7dc90c807
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml
@@ -0,0 +1,268 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <sys:Double x:Key="TopBorderThumbHeight">8</sys:Double>
+
+    <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
+    <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
+
+    <!-- =============================================================================== -->
+    <!-- WindowControl                                                                    -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="WindowControlTemplate" TargetType="{x:Type local:WindowControl}">
+        <Grid>
+            <Border x:Name="PART_WindowRoot"
+                          BorderThickness="{TemplateBinding WindowBorderThickness}"
+                          BorderBrush="{TemplateBinding WindowBorderBrush}"
+                          CornerRadius="0"
+                          Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}">
+                <Border.Background>
+                    <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
+                        <Binding Path="WindowBackground" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="WindowOpacity" RelativeSource="{RelativeSource TemplatedParent}" />
+                    </MultiBinding>
+                </Border.Background>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+               <!-- Header Grid-->
+                    <Grid x:Name="PART_HeaderGrid">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition x:Name="HeaderButtonsColumn" Width="{Binding ActualWidth, ElementName=ButtonsPanel}"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition x:Name="HeaderRow" Height="22" />
+                            <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </Grid.RowDefinitions>
+
+                        <!-- Icon and Title -->
+                        <Image x:Name="PART_Icon"
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Grid.Column="1"
+                                       VerticalAlignment="Center"
+                                       Source="{TemplateBinding CaptionIcon}"
+                                       MaxWidth="15"
+                                       MaxHeight="15"
+                                       Margin="0,2,0,2">
+                        </Image>
+                        <Grid x:Name="Title"
+                                 Grid.Column="2"
+                                 Grid.Row="0"
+                                 Grid.RowSpan="2">
+                              <!-- Rectangle behind title to display a glow effect on title -->
+                               <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}" 
+                                          Height="{Binding ElementName=TitleGrid, Path=ActualHeight}" 
+                                          HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}" 
+                                          VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
+                                          Fill="{TemplateBinding CaptionShadowBrush}">
+                                   <Rectangle.Effect>
+                                       <BlurEffect Radius="10" />
+                                   </Rectangle.Effect>
+                               </Rectangle>
+                              <Grid x:Name="TitleGrid"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center">
+                                 <TextBlock x:Name="TitleText"
+                                            Text="{TemplateBinding Caption}"
+                                            Foreground="{TemplateBinding CaptionForeground}"
+                                            TextTrimming="CharacterEllipsis"
+                                            Margin="5,0,5,0" />
+                              </Grid>
+                           </Grid>
+
+                        <!-- Header Drag Thumb -->
+                        <Thumb x:Name="PART_HeaderThumb" 
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Grid.Column="2"
+                                       Opacity="0"
+                                       IsTabStop="False"/>
+                    </Grid>
+
+                    <!-- Content Border -->
+                    <Border x:Name="ContentOuterBorder" Grid.Row="1" BorderBrush="Gray" BorderThickness="1">
+                        <Border.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="0">
+                                <Binding Path="WindowThickness.Left" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Bottom" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </Border.Margin>
+                        <Border x:Name="ContentBorder"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Background="{TemplateBinding Background}" 
+                                        BorderBrush="{TemplateBinding BorderBrush}" >
+                            <ContentPresenter x:Name="Content"
+                                                    Content="{TemplateBinding Content}" 
+                                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </Border>
+                    </Border>
+
+
+                    <!-- Close-Maximize-Minimize Buttons -->
+                    <StackPanel x:Name="ButtonsPanel"
+                                        Orientation="Horizontal" 
+                                        VerticalAlignment="Top" 
+                                        HorizontalAlignment="Right">
+                        <StackPanel.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <!-- not used -->
+                            </MultiBinding>
+                        </StackPanel.Margin>
+
+
+
+
+                        <!--close button-->
+                        <Border Margin="1,0,0,0">
+                            <Button x:Name="PART_CloseButton"
+                                            SnapsToDevicePixels="False"
+                                            Style="{TemplateBinding CloseButtonStyle}" 
+                                            ToolTip="Close"
+                                            Visibility="{TemplateBinding CloseButtonVisibility}"
+                                            Height="20" Width="45" 
+                                            IsTabStop="False">
+                                <Path Height="9"
+                                                RenderOptions.EdgeMode="Aliased"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Width="9"
+                                                Fill="White"
+                                                Stretch="None"
+                                                Stroke="Transparent" 
+                                                Data="{StaticResource closeGeometry}">
+                                    <Path.RenderTransform>
+                                        <TranslateTransform X="1"  Y="1" />
+                                    </Path.RenderTransform>
+                                </Path>
+                            </Button>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- ToolWindow Close Button -->
+                    <Border x:Name="ToolWindowBorder"
+                                        VerticalAlignment="Top" 
+                                        Visibility="Collapsed"
+                                        HorizontalAlignment="Right">
+                        <Border.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <!-- not used -->
+                            </MultiBinding>
+                        </Border.Margin>
+                        <Button x:Name="PART_ToolWindowCloseButton"
+                                            SnapsToDevicePixels="False"
+                                            Style="{TemplateBinding CloseButtonStyle}"
+                                            Height="20" Width="45" 
+                                            IsTabStop="False">
+                            <Path Height="9"
+                                                RenderOptions.EdgeMode="Aliased"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Width="9"
+                                                Fill="White"
+                                                Stretch="None"
+                                                Stroke="Transparent" 
+                                                Data="{StaticResource closeGeometry}">
+                                <Path.RenderTransform>
+                                    <TranslateTransform X="1"  Y="1" />
+                                </Path.RenderTransform>
+                            </Path>
+                        </Button>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
+            <Border x:Name="PART_BlockMouseInputsBorder" Background="Transparent" Visibility="Collapsed"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+
+            <Trigger Property="WindowStyle" Value="None">
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Title" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_HeaderThumb" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+            </Trigger>
+            <Trigger Property="WindowStyle" Value="ToolWindow">
+                <Setter Property="Width" Value="{Binding ActualWidth, ElementName=ToolWindowBorder}" TargetName="HeaderButtonsColumn" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+                <Setter Property="Visibility" Value="Visible" TargetName="ToolWindowBorder" />
+            </Trigger>
+
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+            </Trigger>
+
+            <Trigger Property="IsActive" Value="False">
+                <Setter Property="Background" Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FFD3D3D3" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FFDADADA" TargetName="ContentOuterBorder" />
+            </Trigger>
+
+            <!-- #TODODOC-->
+            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
+            <Trigger Property="Text" Value="" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WindowControl}">
+      <Setter Property="CloseButtonStyle" Value="{StaticResource {ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type local:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}}" />
+        <Setter Property="Background" Value="{StaticResource Window_Background}" />
+        <Setter Property="CaptionForeground" Value="{StaticResource Window_CaptionForeground}" />
+        <Setter Property="CaptionShadowBrush" Value="{StaticResource Window_CaptionShadowBrush}" />
+        <Setter Property="WindowBorderBrush" Value="{StaticResource Window_WindowBorderBrush}" />
+        <Setter Property="WindowBackground" Value="{StaticResource Window_WindowBackground}" />
+        <Setter Property="WindowBorderThickness" Value="{StaticResource Window_WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground" Value="{StaticResource Window_WindowInactiveBackground}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="Template" Value="{StaticResource WindowControlTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml
new file mode 100644
index 000000000..aff566467
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml
@@ -0,0 +1,59 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives" >
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Background"
+           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+
+      <Setter Property="IsTabStop"
+               Value="False" />
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <CheckBox Foreground="{TemplateBinding Foreground}"
+                              IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                  </Trigger>
+                  <Trigger Property="IsKeyboardFocusWithin" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml
new file mode 100644
index 000000000..36c301c69
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml
@@ -0,0 +1,228 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+         <ResourceDictionary Source="../../../Themes/Generic/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+   <sys:Double x:Key="TopBorderThumbHeight">8</sys:Double>
+
+    <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
+    <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
+    <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter"/>
+
+   <!-- =============================================================================== -->
+   <!-- WindowControl                                                                    -->
+   <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="WindowControlTemplate" TargetType="{x:Type local:WindowControl}">
+        <Grid>
+            <Border x:Name="PART_WindowRoot"
+                          BorderThickness="{TemplateBinding WindowBorderThickness}"
+                          BorderBrush="{TemplateBinding WindowBorderBrush}"
+                          CornerRadius="6"
+                          Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}">
+                <Border.Background>
+                    <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
+                        <Binding Path="WindowBackground" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="WindowOpacity" RelativeSource="{RelativeSource TemplatedParent}" />
+                    </MultiBinding>
+                </Border.Background>
+                <Border x:Name="WindowRootInnerBorder" BorderThickness="1" BorderBrush="White" CornerRadius="6">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Header Grid-->
+                        <Grid x:Name="PART_HeaderGrid">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition x:Name="HeaderButtonsColumn" Width="{Binding ActualWidth, ElementName=ButtonsPanel}"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition x:Name="HeaderRow" Height="22" />
+                                <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </Grid.RowDefinitions>
+
+                            <!-- Icon and Title -->
+                            <Image x:Name="PART_Icon"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Source="{TemplateBinding CaptionIcon}"
+                                MaxWidth="15"
+                                MaxHeight="15"
+                                Margin="0,2,0,2">
+                            </Image>
+                           <Grid x:Name="Title"
+                                 Grid.Column="2"
+                                 Grid.Row="0"
+                                 Grid.RowSpan="2">
+                              <!-- Rectangle behind title to display a glow effect on title -->
+                               <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}" 
+                                          Height="{Binding ElementName=TitleGrid, Path=ActualHeight}" 
+                                          HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}" 
+                                          VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
+                                          Fill="{TemplateBinding CaptionShadowBrush}">
+                                   <Rectangle.Effect>
+                                       <BlurEffect Radius="10" />
+                                   </Rectangle.Effect>
+                              </Rectangle>
+                              <Grid x:Name="TitleGrid"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center">
+                                 <TextBlock x:Name="TitleText"
+                                            Text="{TemplateBinding Caption}"
+                                            Foreground="{TemplateBinding CaptionForeground}"
+                                            TextTrimming="CharacterEllipsis"
+                                            Margin="5,0,5,0" />
+                              </Grid>
+                           </Grid>
+
+                            <!-- Header Drag Thumb -->
+                            <Thumb x:Name="PART_HeaderThumb" 
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="2"
+                                Opacity="0"
+                                IsTabStop="False"/>
+                        </Grid>
+
+                        <!-- Content Border -->
+                        <Border x:Name="ContentOuterBorder" Grid.Row="1" BorderBrush="#FFDFEEFD" BorderThickness="1">
+                            <Border.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="0">
+                                    <Binding Path="WindowThickness.Left" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Bottom" RelativeSource="{RelativeSource TemplatedParent}" />
+                                </MultiBinding>
+                            </Border.Margin>
+                            <Border x:Name="ContentBorder" Background="{TemplateBinding Background}" BorderBrush="#5D6C7A" BorderThickness="1" >
+                                <Border x:Name="ContentInnerBorder" BorderBrush="#FFF2F2F2" BorderThickness="0"> <!-- only visible for ToolWindow -->
+                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                                </Border>
+                            </Border>
+                        </Border>
+
+                        <!-- Close-Maximize-Minimize Buttons -->
+                        <StackPanel x:Name="ButtonsPanel" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right">
+                            <StackPanel.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" /> <!-- not used -->
+                                </MultiBinding>
+                            </StackPanel.Margin>
+                            <!--close button-->
+                           <Button x:Name="PART_CloseButton"
+                                    Style="{TemplateBinding CloseButtonStyle}" 
+                                    Visibility="{TemplateBinding CloseButtonVisibility}" />
+                        </StackPanel>
+
+                        <!-- ToolWindow Close Button -->
+                        <Border x:Name="ToolWindowBorder"
+                                VerticalAlignment="Top"
+                                Visibility="Collapsed"
+                                HorizontalAlignment="Right">
+                            <Border.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" /> <!-- not used -->
+                                </MultiBinding>
+                            </Border.Margin>
+                            <Button x:Name="PART_ToolWindowCloseButton"
+                                    Margin="0,3,0,1"
+                                    Style="{TemplateBinding CloseButtonStyle}" >
+                            </Button>
+                        </Border>
+                    </Grid>
+                </Border>
+            </Border>
+
+            <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
+            <Border x:Name="PART_BlockMouseInputsBorder" Background="Transparent" Visibility="Collapsed"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+
+            <Trigger Property="WindowStyle" Value="None">
+                <Setter Property="Height" Value="0" TargetName="HeaderRow" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Title" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_HeaderThumb" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+            </Trigger>
+            <Trigger Property="WindowStyle" Value="ToolWindow">
+                <Setter Property="Height" Value="Auto" TargetName="HeaderRow" />
+                <Setter Property="Width" Value="{Binding ActualWidth, ElementName=ToolWindowBorder}" TargetName="HeaderButtonsColumn" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+                <Setter Property="Visibility" Value="Visible" TargetName="ToolWindowBorder" />
+                <Setter Property="CornerRadius" Value="0" TargetName="PART_WindowRoot" />
+                <Setter Property="CornerRadius" Value="0" TargetName="WindowRootInnerBorder" />
+                <Setter Property="BorderBrush" Value="White" TargetName="ContentOuterBorder" />
+                <Setter Property="BorderBrush" Value="Black" TargetName="ContentBorder" />
+                <Setter Property="BorderThickness" Value="1" TargetName="ContentInnerBorder" />
+            </Trigger>
+
+            <Trigger Property="IsActive" Value="False">
+                <Setter Property="Background" Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FF666666" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FF7B7B7B" TargetName="ContentBorder" />
+            </Trigger>
+
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+            </Trigger>
+
+            <!-- #TODODOC-->
+            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
+            <Trigger Property="Text" Value="" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+      </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WindowControl}" >
+      <Setter Property="CloseButtonStyle" Value="{StaticResource {ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type local:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}}" />
+        <Setter Property="Background" Value="{StaticResource Window_Background}" />
+        <Setter Property="CaptionForeground" Value="{StaticResource Window_CaptionForeground}" />
+        <Setter Property="WindowBorderBrush" Value="{StaticResource Window_WindowBorderBrush}" />
+        <Setter Property="WindowBackground" Value="{StaticResource Window_WindowBackground}" />
+        <Setter Property="WindowBorderThickness" Value="{StaticResource Window_WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground" Value="{StaticResource Window_WindowInactiveBackground}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="Template" Value="{StaticResource WindowControlTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
index 007861261..5e3fecfa4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
@@ -26,6 +26,7 @@ public static class ResourceKeys
     public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
     public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
     public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
+    public static readonly ResourceKey ControlSelectedBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey");
     public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
 
     public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
@@ -52,12 +53,9 @@ public static class ResourceKeys
     public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
     public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
 
-
-
     public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
 
-
-
     public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
index 1627c4e4f..e7fb9b48d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
index f15280504..22eed4dff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
index b7bedf241..f71cbffa3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index 5a70052da..7f9abf2e9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
index cfe2a0de5..7259fc1bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
index 8aa50a947..f77c43bc0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
index ede76b987..2a6c88cc3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
new file mode 100644
index 000000000..89ff8d8d9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
@@ -0,0 +1,98 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class FontUtilities
+  {
+    internal static IEnumerable<FontFamily> Families
+    {
+      get
+      {
+#if !VS2008
+        // Workaround for a WPF 4 bug.
+        foreach( FontFamily font in Fonts.SystemFontFamilies )
+        {
+          try
+          {
+            // In WPF 4, this will throw an exception.
+            var throwAcess = font.FamilyNames;
+          }
+          catch 
+          { 
+            // It throws. Go to the next font family.
+            continue;
+          }
+
+          // If it does not throw, return the font.
+          yield return font;
+        }
+#else
+      return Fonts.SystemFontFamilies;
+#endif
+      }
+    }
+
+    internal static IEnumerable<FontWeight> Weights
+    {
+      get
+      {
+        yield return FontWeights.Black;
+        yield return FontWeights.Bold;
+        yield return FontWeights.ExtraBlack;
+        yield return FontWeights.ExtraBold;
+        yield return FontWeights.ExtraLight;
+        yield return FontWeights.Light;
+        yield return FontWeights.Medium;
+        yield return FontWeights.Normal;
+        yield return FontWeights.SemiBold;
+        yield return FontWeights.Thin;
+      }
+    }
+
+    internal static IEnumerable<FontStyle> Styles
+    {
+      get
+      {
+        yield return FontStyles.Italic;
+        yield return FontStyles.Normal;
+      }
+    }
+
+    internal static IEnumerable<FontStretch> Stretches
+    {
+      get
+      {
+        yield return FontStretches.Condensed;
+        yield return FontStretches.Expanded;
+        yield return FontStretches.ExtraCondensed;
+        yield return FontStretches.ExtraExpanded;
+        yield return FontStretches.Normal;
+        yield return FontStretches.SemiCondensed;
+        yield return FontStretches.SemiExpanded;
+        yield return FontStretches.UltraCondensed;
+        yield return FontStretches.UltraExpanded;
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
new file mode 100644
index 000000000..bc54a7c62
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -0,0 +1,91 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal sealed class GeneralUtilities : DependencyObject
+  {
+    private GeneralUtilities() { }
+
+    #region StubValue attached property
+
+    internal static readonly DependencyProperty StubValueProperty = DependencyProperty.RegisterAttached(
+      "StubValue",
+      typeof( object ),
+      typeof( GeneralUtilities ),
+      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
+
+    internal static object GetStubValue( DependencyObject obj )
+    {
+      return ( object )obj.GetValue( GeneralUtilities.StubValueProperty );
+    }
+
+    internal static void SetStubValue( DependencyObject obj, object value )
+    {
+      obj.SetValue( GeneralUtilities.StubValueProperty, value );
+    }
+
+    #endregion StubValue attached property
+
+    public static object GetPathValue( object sourceObject, string path )
+    {
+      var targetObj = new GeneralUtilities();
+      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, new Binding( path ) { Source = sourceObject } );
+      object value = GeneralUtilities.GetStubValue( targetObj );
+      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
+      return value;
+    }
+
+    public static object GetBindingValue( object sourceObject, Binding binding )
+    {
+      Binding bindingClone = new Binding()
+      {
+        BindsDirectlyToSource = binding.BindsDirectlyToSource,
+        Converter = binding.Converter,
+        ConverterCulture = binding.ConverterCulture,
+        ConverterParameter = binding.ConverterParameter,
+        FallbackValue = binding.FallbackValue,
+        Mode = BindingMode.OneTime, 
+        Path = binding.Path,
+        StringFormat = binding.StringFormat,
+        TargetNullValue = binding.TargetNullValue,
+        XPath = binding.XPath
+      };
+
+      bindingClone.Source = sourceObject;
+
+      var targetObj = new GeneralUtilities();
+      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, bindingClone );
+      object value = GeneralUtilities.GetStubValue( targetObj );
+      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
+      return value;
+    }
+
+    internal static bool CanConvertValue( object value, object targetType )
+    {
+      return ( ( value != null )
+              && ( !object.Equals( value.GetType(), targetType ) )
+              && ( !object.Equals( targetType, typeof( object ) ) ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
index c9fd87bbc..9ab3ee99d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
new file mode 100644
index 000000000..564108d04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
@@ -0,0 +1,36 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class ListUtilities
+  {
+    internal static Type GetListItemType( Type listType )
+    {
+      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
+        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
+
+      return ( iListOfT != null )
+        ? iListOfT.GetGenericArguments()[ 0 ]
+        : null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs
deleted file mode 100644
index 39c04f844..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  [DebuggerStepThrough]
-  internal sealed class NotifyPropertyChangedHelper
-  {
-    #region Constructor
-
-    internal NotifyPropertyChangedHelper(
-      INotifyPropertyChanged owner,
-      Action<string> notifyPropertyChangedDelegate )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      if( notifyPropertyChangedDelegate == null )
-        throw new ArgumentNullException( "notifyPropertyChangedDelegate" );
-
-      m_owner = owner;
-      m_delegate = notifyPropertyChangedDelegate;
-    }
-
-    #endregion
-
-    internal static bool PropertyChanged( string propertyName, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      string target = e.PropertyName;
-      if( target == propertyName )
-        return true;
-
-      return ( !targetPropertyOnly )
-          && ( string.IsNullOrEmpty( target ) );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TOwner, TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    internal void RaisePropertyChanged( string propertyName )
-    {
-      ReflectionHelper.ValidatePropertyName( m_owner, propertyName );
-
-      this.InvokeDelegate( propertyName );
-    }
-
-    internal void RaisePropertyChanged<TMember>( Expression<Func<TMember>> expression )
-    {
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      var propertyName = NotifyPropertyChangedHelper.GetPropertyName( body, m_owner.GetType() );
-
-      this.InvokeDelegate( propertyName );
-    }
-
-    internal void HandleReferenceChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue ) where TMember : class
-    {
-      if( localReference != newValue )
-      {
-        this.ExecutePropertyChanged( expression, ref localReference, newValue );
-      }
-    }
-
-    internal void HandleEqualityChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue )
-    {
-      if( !object.Equals( localReference, newValue ) )
-      {
-        this.ExecutePropertyChanged( expression, ref localReference, newValue );
-      }
-    }
-
-    private void ExecutePropertyChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue )
-    {
-      TMember oldValue = localReference;
-      localReference = newValue;
-      this.RaisePropertyChanged( expression );
-    }
-
-    internal static string GetPropertyName<TMember>( Expression<Func<TMember>> expression, Type ownerType )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.GetPropertyName( body, ownerType );
-    }
-
-    private static bool PropertyChanged( MemberExpression expression, Type ownerType, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      var propertyName = NotifyPropertyChangedHelper.GetPropertyName( expression, ownerType );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( propertyName, e, targetPropertyOnly );
-    }
-
-    private static string GetPropertyName( MemberExpression expression, Type ownerType )
-    {
-      var targetType = expression.Expression.Type;
-      if( !targetType.IsAssignableFrom( ownerType ) )
-        throw new ArgumentException( "The expression must target a property or field on the appropriate owner.", "expression" );
-
-      return ReflectionHelper.GetPropertyOrFieldName( expression );
-    }
-
-    private void InvokeDelegate( string propertyName )
-    {
-      m_delegate.Invoke( propertyName );
-    }
-
-    #region Private Fields
-
-    private readonly INotifyPropertyChanged m_owner;
-    private readonly Action<string> m_delegate;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
index 1b31faa45..613a3f09f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
new file mode 100644
index 000000000..510b47c0a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
@@ -0,0 +1,127 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class PropertyChangedExt
+  {
+    #region Notify Methods
+
+    public static void Notify<TMember>( 
+      this INotifyPropertyChanged sender,
+      PropertyChangedEventHandler handler, 
+      Expression<Func<TMember>> expression )
+    {
+      if( sender == null )
+        throw new ArgumentNullException( "sender" );
+
+      if( expression == null )
+        throw new ArgumentNullException( "expression" );
+
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      string propertyName = PropertyChangedExt.GetPropertyName( body, sender.GetType() );
+
+      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
+    }
+
+    public static void Notify( this INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
+    {
+      if( sender == null )
+        throw new ArgumentNullException( "sender" );
+
+      if( propertyName == null )
+        throw new ArgumentNullException( "propertyName" );
+
+      ReflectionHelper.ValidatePropertyName( sender, propertyName );
+
+      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
+    }
+
+    private static void NotifyCore( INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
+    {
+      if( handler != null )
+      {
+        handler( sender, new PropertyChangedEventArgs( propertyName ) );
+      }
+    }
+
+    #endregion
+
+    #region PropertyChanged Verification Methods
+
+    internal static bool PropertyChanged( string propertyName, PropertyChangedEventArgs e, bool targetPropertyOnly )
+    {
+      string target = e.PropertyName;
+      if( target == propertyName )
+        return true;
+
+      return ( !targetPropertyOnly )
+          && ( string.IsNullOrEmpty( target ) );
+    }
+
+    internal static bool PropertyChanged<TOwner, TMember>(
+      Expression<Func<TMember>> expression,
+      PropertyChangedEventArgs e,
+      bool targetPropertyOnly )
+    {
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
+    }
+
+    internal static bool PropertyChanged<TOwner, TMember>(
+      Expression<Func<TOwner, TMember>> expression,
+      PropertyChangedEventArgs e,
+      bool targetPropertyOnly )
+    {
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
+    }
+
+    private static bool PropertyChanged( MemberExpression expression, Type ownerType, PropertyChangedEventArgs e, bool targetPropertyOnly )
+    {
+      var propertyName = PropertyChangedExt.GetPropertyName( expression, ownerType );
+
+      return PropertyChangedExt.PropertyChanged( propertyName, e, targetPropertyOnly );
+    }
+
+    #endregion
+
+    private static string GetPropertyName( MemberExpression expression, Type ownerType )
+    {
+      var targetType = expression.Expression.Type;
+      if( !targetType.IsAssignableFrom( ownerType ) )
+        throw new ArgumentException( "The expression must target a property or field on the appropriate owner.", "expression" );
+
+      return ReflectionHelper.GetPropertyOrFieldName( expression );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
index 6fd42213c..028ad56a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
index 8205d68a6..e4b4aa8cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -129,5 +129,11 @@ internal static bool TryGetPropertyOrFieldName<TMember>( Expression<Func<TMember
 
       return ReflectionHelper.TryGetPropertyOrFieldName( expression.Body as MemberExpression, out propertyOrFieldName );
     }
+
+    public static bool IsPublicInstanceProperty( Type type, string propertyName )
+    {
+      BindingFlags flags = ( System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public );
+      return type.GetProperty( propertyName, flags ) != null;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
index 10a3e148f..2b80831c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.IO;
 using System.Reflection;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
index 260b46ffd..7467beb33 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
index 69cb32db1..bf01e59e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
index be904cae8..28a1720e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
index 245e3e1b3..0c67b3ba4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
index d30eefab3..b29d30d0c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
new file mode 100644
index 000000000..90f32750b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class WeakEventListener<TArgs> : IWeakEventListener where TArgs : EventArgs
+  {
+    private Action<object,TArgs> _callback;
+
+    public WeakEventListener(Action<object,TArgs> callback)
+    {
+      if( callback == null )
+         throw new ArgumentNullException( "callback" );
+
+      _callback = callback;
+    }
+
+    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      _callback(sender, (TArgs)e);
+      return true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
new file mode 100644
index 000000000..580cd09b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class WindowUtilities
+  {
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
new file mode 100644
index 000000000..c07e41865
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
@@ -0,0 +1,150 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Collections.Specialized;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  internal class WeakCollectionChangedWrapper : IList, ICollection, INotifyCollectionChanged
+  {
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _innerListListener;
+    private IList _innerList;
+
+    public WeakCollectionChangedWrapper( IList sourceList )
+    {
+      _innerList = sourceList;
+      var notifyList = _innerList as INotifyCollectionChanged;
+      if( notifyList != null )
+      {
+        _innerListListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( OnInnerCollectionChanged );
+        CollectionChangedEventManager.AddListener( notifyList, _innerListListener );
+      }
+    }
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    private void OnInnerCollectionChanged( object sender, NotifyCollectionChangedEventArgs args )
+    {
+      if( this.CollectionChanged != null )
+      {
+        this.CollectionChanged( this, args );
+      }
+    }
+
+    internal void ReleaseEvents()
+    {
+      if( _innerListListener != null )
+      {
+        CollectionChangedEventManager.RemoveListener( ( INotifyCollectionChanged )_innerList, _innerListListener );
+        _innerListListener = null;
+      }
+    }
+
+    #region IList Members
+
+    int IList.Add( object value )
+    {
+      return _innerList.Add( value );
+    }
+
+    void IList.Clear()
+    {
+      _innerList.Clear();
+    }
+
+    bool IList.Contains( object value )
+    {
+      return _innerList.Contains( value );
+    }
+
+    int IList.IndexOf( object value )
+    {
+      return _innerList.IndexOf( value );
+    }
+
+    void IList.Insert( int index, object value )
+    {
+      _innerList.Insert( index, value );
+    }
+
+    bool IList.IsFixedSize
+    {
+      get { return _innerList.IsFixedSize; }
+    }
+
+    bool IList.IsReadOnly
+    {
+      get { return _innerList.IsReadOnly; }
+    }
+
+    void IList.Remove( object value )
+    {
+      _innerList.Remove( value );
+    }
+
+    void IList.RemoveAt( int index )
+    {
+      _innerList.RemoveAt( index );
+    }
+
+    object IList.this[ int index ]
+    {
+      get { return _innerList[ index ]; }
+      set { _innerList[ index ] = value; }
+    }
+    #endregion
+
+    #region ICollection Members
+
+    void ICollection.CopyTo( Array array, int index )
+    {
+      _innerList.CopyTo( array, index );
+    }
+
+    int ICollection.Count
+    {
+      get { return _innerList.Count; }
+    }
+
+    bool ICollection.IsSynchronized
+    {
+      get { return _innerList.IsSynchronized; }
+    }
+
+    object ICollection.SyncRoot
+    {
+      get { return _innerList.SyncRoot; }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return _innerList.GetEnumerator();
+    }
+
+    #endregion
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index b9133117b..02af1188f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -29,21 +29,41 @@ namespace Xceed.Wpf.Toolkit
 {
   [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
   [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
+  [TemplatePart( Name = PART_TimeUpDown, Type = typeof( TimePicker ) )]
   public class DateTimePicker : DateTimeUpDown
   {
     private const string PART_Calendar = "PART_Calendar";
     private const string PART_Popup = "PART_Popup";
+    private const string PART_TimeUpDown = "PART_TimeUpDown";
 
     #region Members
 
     private Calendar _calendar;
     private Popup _popup;
     private DateTime? _initialValue;
+    private TimePicker _timePicker;
 
     #endregion //Members
 
     #region Properties
 
+    #region AutoCloseCalendar
+
+    public static readonly DependencyProperty AutoCloseCalendarProperty = DependencyProperty.Register( "AutoCloseCalendar", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool AutoCloseCalendar
+    {
+      get
+      {
+        return ( bool )GetValue( AutoCloseCalendarProperty );
+      }
+      set
+      {
+        SetValue( AutoCloseCalendarProperty, value );
+      }
+    }
+
+    #endregion //AutoCloseCalendar
+
     #region IsOpen
 
     public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
@@ -189,12 +209,21 @@ public override void OnApplyTemplate()
         _calendar.SelectedDate = Value ?? null;
         _calendar.DisplayDate = Value ?? DateTime.Now;
       }
+
+      _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker;
     }
 
     protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
     {
       if( Mouse.Captured is CalendarItem )
+      {
         Mouse.Capture( null );
+
+        if( AutoCloseCalendar )
+        {
+          CloseDateTimePicker( true );
+        }
+      }
     }
 
     protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
@@ -239,18 +268,15 @@ private void OnKeyDown( object sender, KeyEventArgs e )
             CloseDateTimePicker( true );
             e.Handled = true;
           }
-          else if( e.Key == Key.Enter )
+          else
           {
-            CloseDateTimePicker( true );
-            e.Handled = true;
-          }
-          else if( e.Key == Key.Escape )
-          {
-            Value = _initialValue;
-            CloseDateTimePicker( true );
-            e.Handled = true;
+            this.ManageEnterEscapeKeys( e );
           }
         }
+        else if( _timePicker.IsKeyboardFocusWithin && !_timePicker.IsOpen && !e.Handled)
+        {
+          this.ManageEnterEscapeKeys( e );
+        }
       }
     }
 
@@ -297,6 +323,27 @@ private void CloseDateTimePicker( bool isFocusOnTextBox )
         TextBox.Focus();
     }
 
+    private void ManageEnterEscapeKeys( KeyEventArgs e )
+    {
+      if( e.Key == Key.Enter )
+      {
+        this.CloseDateTimePicker( true );
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Escape )
+      {
+        // Avoid setting the "Value" property when no change has occurred.
+        // The original value may not be a local value. Setting
+        // it, even with the same value, will override a one-way binding.
+        if( !object.Equals( this.Value, _initialValue ) )
+        {
+          this.Value = _initialValue;
+        }
+        this.CloseDateTimePicker( true );
+        e.Handled = true;
+      }
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..d509bb727
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,168 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+									   RenderMouseOver="{TemplateBinding IsMouseOver}"
+									   RenderPressed="{TemplateBinding IsPressed}">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                        </chrome:ButtonChrome>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- DateTimePicker                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DateTimePicker}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+                    <Border>
+                        <Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <local:ButtonSpinner x:Name="PART_Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             BorderBrush="{TemplateBinding BorderBrush}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                                    <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                                </local:ButtonSpinner>
+                                <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                            </Grid>
+                            <Popup x:Name="PART_Popup" IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                                <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                    <StackPanel>
+                                        <Calendar x:Name="PART_Calendar" BorderThickness="0" />
+                                        <local:TimePicker x:Name="PART_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                                    </StackPanel>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
index d2fa3c18e..85635f171 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
@@ -23,7 +23,7 @@
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -123,8 +123,8 @@
                                                    Padding="0"
                                                    TextAlignment="{TemplateBinding TextAlignment}"
                                                    TextWrapping="NoWrap" 
-                                                   TabIndex="{TemplateBinding TabIndex}"
                                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   TabIndex="{TemplateBinding TabIndex}"
                                                    Watermark="{TemplateBinding Watermark}"
                                                    WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
                         </local:ButtonSpinner>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
index 678fcfa53..b5bba325d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
index 7304c3c1f..9f17e1459 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
index bd349878c..f8d78a859 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
index 234199a52..bc3b660e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index e94727fce..3f4347ec7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -21,6 +21,8 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Data;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
+using System.Windows.Controls;
+using System.Linq;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -130,13 +132,19 @@ public DateTimeUpDown()
 
     public override void OnApplyTemplate()
     {
-      if( TextBox != null )
-        TextBox.SelectionChanged -= TextBox_SelectionChanged;
+      if( this.TextBox != null )
+      {
+        this.TextBox.SelectionChanged -= this.TextBox_SelectionChanged;
+        this.TextBox.GotFocus -= new RoutedEventHandler( this.TextBox_GotFocus );
+      }
 
       base.OnApplyTemplate();
 
       if( TextBox != null )
-        TextBox.SelectionChanged += TextBox_SelectionChanged;
+      {
+        this.TextBox.SelectionChanged += this.TextBox_SelectionChanged;
+        this.TextBox.GotFocus += new RoutedEventHandler(this.TextBox_GotFocus);
+      }
     }
 
     protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
@@ -146,22 +154,31 @@ protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo
 
     protected override void OnIncrement()
     {
-      if( Value.HasValue )
-        UpdateDateTime( 1 );
-      else
-        Value = DefaultValue ?? DateTime.Now;
+      if( this.IsCurrentValueValid() )
+      {
+        if( Value.HasValue )
+          UpdateDateTime( 1 );
+        else
+          Value = DefaultValue ?? DateTime.Now;
+      }
     }
 
     protected override void OnDecrement()
     {
-      if( Value.HasValue )
-        UpdateDateTime( -1 );
-      else
-        Value = DefaultValue ?? DateTime.Now;
+      if( this.IsCurrentValueValid() )
+      {
+        if( Value.HasValue )
+          UpdateDateTime( -1 );
+        else
+          Value = DefaultValue ?? DateTime.Now;
+      }
     }
 
     protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
+    {      
+      int selectionStart = (_selectedDateTimeInfo != null) ? _selectedDateTimeInfo.StartPosition : 0;
+      int selectionLength = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.Length : 0;
+
       switch( e.Key )
       {
         case Key.Enter:
@@ -172,11 +189,56 @@ protected override void OnPreviewKeyDown( KeyEventArgs e )
               BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
               binding.UpdateSource();
               _fireSelectionChangedEvent = true;
-              e.Handled = true;
             }
             return;
           }
-        default:
+        case Key.Add:
+          if( this.AllowSpin && !this.IsReadOnly )
+          {
+            this.DoIncrement();
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.Subtract:
+          if( this.AllowSpin && !this.IsReadOnly )
+          {
+            this.DoDecrement();
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.OemSemicolon:
+          if( this.IsCurrentValueValid() && ( Keyboard.Modifiers == ModifierKeys.Shift ) )
+          {
+            this.PerformKeyboardSelection( selectionStart + selectionLength );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.OemPeriod:
+        case Key.OemComma:
+        case Key.OemQuotes:
+        case Key.OemMinus:
+        case Key.Divide:
+        case Key.Decimal: 
+        case Key.Right:
+          if( this.IsCurrentValueValid() )
+          {
+            this.PerformKeyboardSelection( selectionStart + selectionLength );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.Left:
+          if( this.IsCurrentValueValid() )
+          {
+            this.PerformKeyboardSelection( selectionStart > 0 ? selectionStart - 1 : 0 );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+         default:
           {
             _fireSelectionChangedEvent = false;
             break;
@@ -199,9 +261,8 @@ protected override void OnTextChanged( string previousValue, string currentValue
       if( string.IsNullOrEmpty( text ) )
         return null;
 
-      DateTime current = Value.HasValue ? Value.Value : DateTime.Parse( DateTime.Now.ToString(), CultureInfo.DateTimeFormat );
       DateTime result;
-      var success = DateTimeParser.TryParse( text, GetFormatString( Format ), current, CultureInfo, out result );
+      this.TryParseDateTime( text, out result );
 
       return result;
     }
@@ -233,7 +294,7 @@ protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
 
     #region Event Hanlders
 
-    void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
+    private void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
     {
       if( _fireSelectionChangedEvent )
         PerformMouseSelection();
@@ -241,10 +302,22 @@ void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
         _fireSelectionChangedEvent = true;
     }
 
+    private void TextBox_GotFocus( object sender, RoutedEventArgs e )
+    {
+      this.Select( this.GetDateTimeInfo( 0 ) );
+    }
+
     #endregion //Event Hanlders
 
     #region Methods
 
+    public void SelectAll()
+    {
+      _fireSelectionChangedEvent = false;
+      TextBox.SelectAll();
+      _fireSelectionChangedEvent = true;
+    }
+
     private void FormatUpdated()
     {
       InitializeDateTimeInfoList();
@@ -537,22 +610,88 @@ private void ParseValueIntoDateTimeInfo()
 
     private void PerformMouseSelection()
     {
-      _dateTimeInfoList.ForEach( info =>
+      this.Select( this.GetDateTimeInfo( TextBox.SelectionStart ) );
+    }
+
+    private void PerformKeyboardSelection( int nextSelectionStart )
+    {
+      this.TextBox.Focus();
+
+      this.CommitInput();
+
+      int selectedDateStartPosition = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.StartPosition : 0;
+      int direction = nextSelectionStart - selectedDateStartPosition;
+      if( direction > 0 )
+      {
+        this.Select( this.GetNextDateTimeInfo( nextSelectionStart ) );
+      }
+      else
+      {
+        this.Select( this.GetPreviousDateTimeInfo( nextSelectionStart - 1) );
+      }
+    }
+
+    private DateTimeInfo GetDateTimeInfo( int selectionStart )
+    {
+      return _dateTimeInfoList.FirstOrDefault( (info) =>
+                              ( info.StartPosition <= selectionStart ) && ( selectionStart < ( info.StartPosition + info.Length ) ) );
+    }
+
+    private DateTimeInfo GetNextDateTimeInfo( int nextSelectionStart )
+    {
+      DateTimeInfo nextDateTimeInfo = this.GetDateTimeInfo( nextSelectionStart );
+      if( nextDateTimeInfo == null )
+      {
+        nextDateTimeInfo = _dateTimeInfoList.First();
+      }
+
+      DateTimeInfo initialDateTimeInfo = nextDateTimeInfo;
+
+      while( nextDateTimeInfo.Type == DateTimePart.Other )
       {
-        if( ( info.StartPosition <= TextBox.SelectionStart ) && ( TextBox.SelectionStart < ( info.StartPosition + info.Length ) ) )
+        nextDateTimeInfo = this.GetDateTimeInfo( nextDateTimeInfo.StartPosition + nextDateTimeInfo.Length );
+        if( nextDateTimeInfo == null )
         {
-          Select( info );
-          return;
+          nextDateTimeInfo = _dateTimeInfoList.First();
         }
-      } );
+        if( object.Equals( nextDateTimeInfo, initialDateTimeInfo ) )
+          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
+      }
+      return nextDateTimeInfo;
+    }
+
+    private DateTimeInfo GetPreviousDateTimeInfo( int previousSelectionStart )
+    {
+      DateTimeInfo previousDateTimeInfo = this.GetDateTimeInfo( previousSelectionStart );
+      if( previousDateTimeInfo == null )
+      {
+        previousDateTimeInfo = _dateTimeInfoList.Last();
+      }
+
+      DateTimeInfo initialDateTimeInfo = previousDateTimeInfo;
+
+      while( previousDateTimeInfo.Type == DateTimePart.Other )
+      {
+        previousDateTimeInfo = this.GetDateTimeInfo( previousDateTimeInfo.StartPosition - 1 );
+        if( previousDateTimeInfo == null )
+        {
+          previousDateTimeInfo = _dateTimeInfoList.Last();
+        }
+        if( object.Equals( previousDateTimeInfo, initialDateTimeInfo ) )
+          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
+      }
+      return previousDateTimeInfo;
     }
 
     private void Select( DateTimeInfo info )
     {
-      _fireSelectionChangedEvent = false;
-      TextBox.Select( info.StartPosition, info.Length );
-      _fireSelectionChangedEvent = true;
-      _selectedDateTimeInfo = info;
+      if( info != null )
+      {
+        _fireSelectionChangedEvent = false;
+        TextBox.Select( info.StartPosition, info.Length );
+        _fireSelectionChangedEvent = true;
+        _selectedDateTimeInfo = info;
+      }
     }
 
     private string GetFormatString( DateTimeFormat dateTimeFormat )
@@ -580,7 +719,39 @@ private string GetFormatString( DateTimeFormat dateTimeFormat )
         case DateTimeFormat.YearMonth:
           return CultureInfo.DateTimeFormat.YearMonthPattern;
         case DateTimeFormat.Custom:
-          return FormatString;
+          {
+            switch( this.FormatString )
+            {
+              case "d":
+                return CultureInfo.DateTimeFormat.ShortDatePattern;
+              case "t":
+                return CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "T":
+                return CultureInfo.DateTimeFormat.LongTimePattern;
+              case "D":
+                return CultureInfo.DateTimeFormat.LongDatePattern;
+              case "f":
+                return CultureInfo.DateTimeFormat.LongDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "F":
+                return CultureInfo.DateTimeFormat.FullDateTimePattern;
+              case "g":
+                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "G":
+                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.LongTimePattern;
+              case "m":
+                return CultureInfo.DateTimeFormat.MonthDayPattern;
+              case "y":
+                return CultureInfo.DateTimeFormat.YearMonthPattern;
+              case "r":
+                return CultureInfo.DateTimeFormat.RFC1123Pattern;
+              case "s":
+                return CultureInfo.DateTimeFormat.SortableDateTimePattern;
+              case "u":
+                return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
+              default:
+                return FormatString;
+            }
+          }
         default:
           throw new ArgumentException( "Not a supported format" );
       }
@@ -660,6 +831,31 @@ private void UpdateDateTime( int value )
       _fireSelectionChangedEvent = true;
     }
 
+    private bool TryParseDateTime( string text, out DateTime result )
+    {
+      bool isValid;
+
+      DateTime current = this.Value.HasValue ? this.Value.Value : DateTime.Parse( DateTime.Now.ToString(), this.CultureInfo.DateTimeFormat );
+      isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, out result );
+
+      if( !isValid && ( this.Format == DateTimeFormat.Custom ) )
+      {
+        isValid = DateTime.TryParseExact( text, this.GetFormatString( this.Format ), this.CultureInfo, DateTimeStyles.None, out result );
+      }
+
+      return isValid;
+    }
+
+    private bool IsCurrentValueValid()
+    {
+      DateTime result;
+
+      if( string.IsNullOrEmpty( this.TextBox.Text ) )
+        return true;
+
+      return this.TryParseDateTime( this.TextBox.Text, out result );
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..b400f1098
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,91 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+
+    <!-- =============================================================================== -->
+    <!-- DateTimeUpDown                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DateTimeUpDown}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+                    <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                    </local:ButtonSpinner>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                          <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                      </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
index 0579fb328..263490442 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
@@ -1,25 +1,26 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <!-- =============================================================================== -->
@@ -28,18 +29,20 @@
 
    <Style TargetType="{x:Type local:DateTimeUpDown}">
       <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
       <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Focusable" Value="False" />
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
       <Setter Property="HorizontalContentAlignment" Value="Right" />
       <Setter Property="TextAlignment" Value="Right" />
       <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="IsTabStop" Value="False" />
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
                <local:ButtonSpinner x:Name="PART_Spinner"
                                     IsTabStop="False"
                                     Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     AllowSpin="{TemplateBinding AllowSpin}"
                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
@@ -57,7 +60,7 @@
                                           IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
                                           MinWidth="20"
                                           AcceptsReturn="False"
-                                          Padding="0"
+                                          Padding="{TemplateBinding Padding}"
                                           TextAlignment="{TemplateBinding TextAlignment}"
                                           TextWrapping="NoWrap" 
                                           TabIndex="{TemplateBinding TabIndex}"
@@ -65,6 +68,11 @@
                                           Watermark="{TemplateBinding Watermark}"
                                           WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
                </local:ButtonSpinner>
+                 <ControlTemplate.Triggers>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                   </Trigger>
+               </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index e2863f273..b96f148f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -252,18 +252,7 @@ private void Popup_Opened( object sender, EventArgs e )
       // Set the focus on the content of the ContentPresenter.
       if( _contentPresenter != null )
       {
-        DependencyObject o = _contentPresenter.Content as DependencyObject;
-        while( o != null && ( VisualTreeHelper.GetChildrenCount(o) > 0 ) )
-        {
-          if( o is UIElement )
-          {
-            if( ( ( UIElement )o ).Focusable )
-              break;
-          }
-          o = VisualTreeHelper.GetChild( o, 0 );
-        }
-
-        ( ( UIElement )o ).Focus();
+        _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..9c51e99c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,98 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- DropDownButton                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DropDownButton}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                        <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <ContentPresenter />
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                            <Grid>
+                                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                     RenderChecked="{TemplateBinding IsOpen}"
+                                                     RenderEnabled="{TemplateBinding IsEnabled}"
+											         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											         RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                            <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                        </Grid>
+                                    </Grid>
+                                </chrome:ButtonChrome>
+                            </Grid>
+                        </ToggleButton>
+
+                        <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding DropDownContent}" />
+                            </Border>
+                        </Popup>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="ToggleButtonChrome" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index 35d83f182..52d36a5d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
deleted file mode 100644
index b62d2e328..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Mag.Converters
-{
-  internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      Thickness thickness = ( Thickness )value;
-      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
index 218367a25..3df55cdc3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
index 911645136..cd1bfa2cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index 27ea57586..07ecca258 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index 39ac20a1d..4535b4e9a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Documents;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index d2ab5339d..2af25cbff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
index 05a3c616f..5bad5932a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
@@ -1,30 +1,31 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters">
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters"
+                    xmlns:coreconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
    <!-- =============================================================================== -->
    <!-- Magnifier                                                                       -->
    <!-- =============================================================================== -->
 
    <conv:RadiusConverter x:Key="RadiusConverter" />
-   <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+   <coreconv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
 
    <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
       <Grid>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
index 90481f60b..7e5825010 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
index ecd67644e..a8cbe8fd0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
index 7472f0c67..6114a0cd2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index 44b3f8a20..6f068c54f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
index b824cf21a..d236101f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -23,6 +23,9 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Text;
 using System.Security.Permissions;
 using System.Security;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
+using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -30,19 +33,19 @@ namespace Xceed.Wpf.Toolkit
   [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
   [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
   [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplatePart( Name = PART_DragWidget, Type = typeof( Thumb ) )]
   [TemplatePart( Name = PART_CancelButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_NoButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_OkButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_YesButton, Type = typeof( Button ) )]
-  public class MessageBox : Control
+  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
+  public class MessageBox : WindowControl
   {
-    private const string PART_DragWidget = "PART_DragWidget";
     private const string PART_CancelButton = "PART_CancelButton";
     private const string PART_NoButton = "PART_NoButton";
     private const string PART_OkButton = "PART_OkButton";
     private const string PART_YesButton = "PART_YesButton";
     private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_WindowControl = "PART_WindowControl";
 
     #region Private Members
 
@@ -56,11 +59,18 @@ public class MessageBox : Control
     /// </summary>
     private MessageBoxResult _defaultResult = MessageBoxResult.None;
 
+    /// <summary>
+    /// Will contain the result when the messagebox is shown inside a WindowContainer
+    /// </summary>
+    private MessageBoxResult _dialogResult = MessageBoxResult.None;
+
     /// <summary>
     /// Tracks the owner of the MessageBox
     /// </summary>
     private Window _owner;
 
+    private WindowControl _windowControl;
+
     #endregion //Private Members
 
     #region Constructors
@@ -70,12 +80,10 @@ static MessageBox()
       DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
     }
 
-    internal MessageBox()
+    public MessageBox()
     {
-      /*user cannot create instance */
-      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( Button_Click ) );
-
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, new ExecutedRoutedEventHandler( ExecuteCopy ) ) );
+      this.Visibility = Visibility.Collapsed;
+      this.InitHandlers();
     }
 
     #endregion //Constructors
@@ -84,52 +92,34 @@ internal MessageBox()
 
     #region Protected Properties
 
-    /// <summary>
-    /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
-    /// </summary>
-    protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
-
     protected Window Container
     {
-      get;
-      private set;
-    }
-    protected Thumb DragWidget
-    {
-      get;
-      private set;
+      get { return ( this.Parent as Window ); }
     }
 
     #endregion //Protected Properties
 
     #region Dependency Properties
 
-    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
-    public string Caption
-    {
-      get
-      {
-        return ( string )GetValue( CaptionProperty );
-      }
-      set
-      {
-        SetValue( CaptionProperty, value );
-      }
-    }
+    #region ButtonRegionBackground
 
-    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( MessageBox ), new UIPropertyMetadata( null ) );
-    public Brush CaptionForeground
+    public static readonly DependencyProperty ButtonRegionBackgroundProperty = DependencyProperty.Register( "ButtonRegionBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush ButtonRegionBackground
     {
       get
       {
-        return ( Brush )GetValue( CaptionForegroundProperty );
+        return ( Brush )GetValue( ButtonRegionBackgroundProperty );
       }
       set
       {
-        SetValue( CaptionForegroundProperty, value );
+        SetValue( ButtonRegionBackgroundProperty, value );
       }
     }
 
+    #endregion //ButtonRegionBackground
+
+    #region CancelButtonContent
+
     public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
     public object CancelButtonContent
     {
@@ -143,44 +133,9 @@ public object CancelButtonContent
       }
     }
 
-    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style CloseButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CloseButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonStyleProperty, value );
-      }
-    }
+    #endregion //CancelButtonContent
 
-    public static readonly DependencyProperty ButtonRegionBackgroundProperty = DependencyProperty.Register( "ButtonRegionBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush ButtonRegionBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( ButtonRegionBackgroundProperty );
-      }
-      set
-      {
-        SetValue( ButtonRegionBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty OkButtonStyleProperty = DependencyProperty.Register( "OkButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style OkButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( OkButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( OkButtonStyleProperty, value );
-      }
-    }
+    #region CancelButtonStyle
 
     public static readonly DependencyProperty CancelButtonStyleProperty = DependencyProperty.Register( "CancelButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
     public Style CancelButtonStyle
@@ -195,45 +150,73 @@ public Style CancelButtonStyle
       }
     }
 
-    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style YesButtonStyle
+    #endregion //CancelButtonStyle
+
+    #region ImageSource
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
+    public ImageSource ImageSource
     {
       get
       {
-        return ( Style )GetValue( YesButtonStyleProperty );
+        return ( ImageSource )GetValue( ImageSourceProperty );
       }
       set
       {
-        SetValue( YesButtonStyleProperty, value );
+        SetValue( ImageSourceProperty, value );
       }
     }
 
-    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style NoButtonStyle
+    #endregion //ImageSource
+
+    #region OkButtonContent
+
+    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
+    public object OkButtonContent
     {
       get
       {
-        return ( Style )GetValue( NoButtonStyleProperty );
+        return ( object )GetValue( OkButtonContentProperty );
       }
       set
       {
-        SetValue( NoButtonStyleProperty, value );
+        SetValue( OkButtonContentProperty, value );
       }
     }
 
-    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
-    public ImageSource ImageSource
+    #endregion //OkButtonContent
+
+    #region OkButtonStyle
+
+    public static readonly DependencyProperty OkButtonStyleProperty = DependencyProperty.Register( "OkButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style OkButtonStyle
     {
       get
       {
-        return ( ImageSource )GetValue( ImageSourceProperty );
+        return ( Style )GetValue( OkButtonStyleProperty );
       }
       set
       {
-        SetValue( ImageSourceProperty, value );
+        SetValue( OkButtonStyleProperty, value );
       }
     }
 
+    #endregion //OkButtonStyle
+
+    #region MessageBoxResult
+
+    /// <summary>
+    /// Gets the MessageBox result, which is set when the "Closed" event is raised.
+    /// </summary>
+    public MessageBoxResult MessageBoxResult
+    {
+      get { return _dialogResult; }
+    }
+
+    #endregion //MessageBoxResult
+
+    #region NoButtonContent
+
     public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
     public object NoButtonContent
     {
@@ -247,19 +230,27 @@ public object NoButtonContent
       }
     }
 
-    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
-    public object OkButtonContent
+    #endregion //NoButtonContent
+
+    #region NoButtonStyle
+
+    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style NoButtonStyle
     {
       get
       {
-        return ( object )GetValue( OkButtonContentProperty );
+        return ( Style )GetValue( NoButtonStyleProperty );
       }
       set
       {
-        SetValue( OkButtonContentProperty, value );
+        SetValue( NoButtonStyleProperty, value );
       }
     }
 
+    #endregion //NoButtonStyle
+
+    #region Text
+
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
     public string Text
     {
@@ -273,64 +264,53 @@ public string Text
       }
     }
 
-    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush WindowBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowBackgroundProperty, value );
-      }
-    }
+    #endregion //Text
 
-    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush WindowBorderBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBorderBrushProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderBrushProperty, value );
-      }
-    }
+    #region YesButtonContent
 
-    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public double WindowOpacity
+    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
+    public object YesButtonContent
     {
       get
       {
-        return ( double )GetValue( WindowOpacityProperty );
+        return ( object )GetValue( YesButtonContentProperty );
       }
       set
       {
-        SetValue( WindowOpacityProperty, value );
+        SetValue( YesButtonContentProperty, value );
       }
     }
 
-    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
-    public object YesButtonContent
+    #endregion //YesButtonContent
+
+    #region YesButtonStyle
+
+    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style YesButtonStyle
     {
       get
       {
-        return ( object )GetValue( YesButtonContentProperty );
+        return ( Style )GetValue( YesButtonStyleProperty );
       }
       set
       {
-        SetValue( YesButtonContentProperty, value );
+        SetValue( YesButtonStyleProperty, value );
       }
     }
 
+    #endregion //YesButtonStyle
+
     #endregion //Dependency Properties
 
     #endregion //Properties
 
     #region Base Class Overrides
 
+    internal override bool AllowPublicIsActiveChange
+    {
+      get { return false; }
+    }
+
     /// <summary>
     /// Overrides the OnApplyTemplate method.
     /// </summary>
@@ -338,13 +318,20 @@ public override void OnApplyTemplate()
     {
       base.OnApplyTemplate();
 
-      if( DragWidget != null )
-        DragWidget.DragDelta -= ( o, e ) => ProcessMove( e );
-
-      DragWidget = GetTemplateChild( PART_DragWidget ) as Thumb;
-
-      if( DragWidget != null )
-        DragWidget.DragDelta += ( o, e ) => ProcessMove( e );
+      if( _windowControl != null )
+      {
+        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClicked( e );
+        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
+      }
+      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
+      if( _windowControl != null )
+      {
+        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClicked( e );
+        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
+      }
+      this.UpdateBlockMouseInputsPanel();
 
       ChangeVisualState( _button.ToString(), true );
 
@@ -359,6 +346,29 @@ public override void OnApplyTemplate()
       SetDefaultResult();
     }
 
+    protected override object OnCoerceCloseButtonVisibility( Visibility newValue )
+    {
+      if( newValue != Visibility.Visible )
+        throw new InvalidOperationException( "Close button on MessageBox is always Visible." );
+      return newValue;
+    }
+
+    protected override object OnCoerceWindowStyle( WindowStyle newValue )
+    {
+      if( newValue != WindowStyle.SingleBorderWindow )
+        throw new InvalidOperationException( "Window style on MessageBox is not available." );
+      return newValue;
+    }
+
+    internal override void UpdateBlockMouseInputsPanel()
+    {
+      if( _windowControl != null )
+      {
+        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
+      }
+    }
+
+
     #endregion //Base Class Overrides
 
     #region Methods
@@ -502,16 +512,89 @@ public static MessageBoxResult Show( Window owner, string messageText, string ca
 
     #endregion //Public Static
 
-    #region Protected
+    #region Public Methods
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox()
+    {
+      if( this.Container != null || this.Parent == null )
+        throw new InvalidOperationException(
+          "This method is not intended to be called while displaying a MessageBox outside of a WindowContainer. Use ShowDialog() instead in that case." );
+
+      if( !( this.Parent is WindowContainer ) )
+        throw new InvalidOperationException(
+          "The MessageBox instance is not intended to be displayed in a container other than a WindowContainer." );
+
+      _dialogResult = System.Windows.MessageBoxResult.None;
+      this.Visibility = Visibility.Visible;
+    }
 
     /// <summary>
-    /// Shows the container which contains the MessageBox.
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
     /// </summary>
-    protected void Show()
+    public void ShowMessageBox( string messageText )
     {
-      Container.ShowDialog();
+      this.ShowMessageBoxCore( messageText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
     }
 
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption )
+    {
+      this.ShowMessageBoxCore( messageText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, icon, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, icon, defaultResult );
+    }
+
+    /// <summary>
+    /// Display the MessageBox window and returns only when this MessageBox closes.
+    /// </summary>
+    public bool? ShowDialog()
+    {
+      if( this.Parent != null )
+        throw new InvalidOperationException(
+          "This method is not intended to be called while displaying a Message Box inside a WindowContainer. Use 'ShowMessageBox()' instead." );
+
+      _dialogResult = System.Windows.MessageBoxResult.None;
+      this.Visibility = Visibility.Visible;
+      this.CreateContainer();
+
+      return this.Container.ShowDialog();
+    }
+
+    #endregion
+
+    #region Protected
     /// <summary>
     /// Initializes the MessageBox.
     /// </summary>
@@ -527,7 +610,6 @@ protected void InitializeMessageBox( Window owner, string text, string caption,
       _defaultResult = defaultResult;
       _owner = owner;
       SetImageSource( image );
-      Container = CreateContainer();
     }
 
     /// <summary>
@@ -542,8 +624,33 @@ protected void ChangeVisualState( string name, bool useTransitions )
 
     #endregion //Protected
 
+
+
+
+
     #region Private
 
+    private bool IsCurrentWindow( object windowtoTest )
+    {
+      return object.Equals( _windowControl, windowtoTest );
+    }
+
+    /// <summary>
+    /// Closes the MessageBox.
+    /// </summary>
+    private void Close()
+    {
+      if( this.Container != null )
+      {
+        // The Window.Closed event callback will call "OnClose"
+        this.Container.Close();
+      }
+      else
+      {
+        this.OnClose();
+      }
+    }
+
     /// <summary>
     /// Sets the button that represents the _defaultResult to the default button and gives it focus.
     /// </summary>
@@ -618,6 +725,19 @@ private Button GetMessageBoxButton( string name )
       return button;
     }
 
+    private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      this.InitializeMessageBox( null, messageText, caption, button, icon, defaultResult );
+      this.ShowMessageBox();
+    }
+
+    private void InitHandlers()
+    {
+      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( this.Button_Click ) );
+
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, new ExecutedRoutedEventHandler( ExecuteCopy ) ) );
+    }
+
     /// <summary>
     /// Shows the MessageBox.
     /// </summary>
@@ -629,6 +749,11 @@ private Button GetMessageBoxButton( string name )
     /// <returns></returns>
     private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
     {
+      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      {
+        throw new InvalidOperationException( "Static methods for MessageBoxes are not available in XBAP. Use the instance ShowMessageBox methods instead." );
+      }
+
       MessageBox msgBox = new MessageBox();
       msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
 
@@ -638,7 +763,7 @@ private static MessageBoxResult ShowCore( Window owner, string messageText, stri
         msgBox.Style = messageBoxStyle;
       }
 
-      msgBox.Show();
+      msgBox.ShowDialog();
       return msgBox.MessageBoxResult;
     }
 
@@ -700,7 +825,7 @@ private void SetImageSource( MessageBoxImage image )
           }
       }
 
-      ImageSource = ( ImageSource )new ImageSourceConverter().ConvertFromString( String.Format( "pack://application:,,,/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ) );
+      this.ImageSource = new BitmapImage( new Uri( String.Format("../Icons/{0}", iconName), UriKind.Relative ) );
     }
 
     /// <summary>
@@ -724,6 +849,7 @@ private Window CreateContainer()
       newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
       newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
       newWindow.WindowStyle = System.Windows.WindowStyle.None;
+      newWindow.Closed += new EventHandler( OnContainerClosed );
       return newWindow;
     }
 
@@ -737,17 +863,91 @@ private Window CreateContainer()
     /// Processes the move of a drag operation on the header.
     /// </summary>
     /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
-    private void ProcessMove( DragDeltaEventArgs e )
+    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
     {
-      double left = 0.0;
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
 
-      if( FlowDirection == System.Windows.FlowDirection.RightToLeft )
-        left = Container.Left - e.HorizontalChange;
-      else
-        left = Container.Left + e.HorizontalChange;
+      e.Handled = true;
+
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        if( this.Container == null )
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
+            left = this.Left - e.HorizontalChange;
+          else
+            left = this.Left + e.HorizontalChange;
+
+          this.Left = left;
+          this.Top += e.VerticalChange;
+        }
+        else
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
+            left = Container.Left - e.HorizontalChange;
+          else
+            left = Container.Left + e.HorizontalChange;
+
+          Container.Left = left;
+          Container.Top += e.VerticalChange;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Processes the double-click on the header.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.Input.Primitives.MouseButtonEventArgs"/> instance containing the event data.</param>
+    protected virtual void OnHeaderIconDoubleClicked( MouseButtonEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
 
-      Container.Left = left;
-      Container.Top = Container.Top + e.VerticalChange;
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = HeaderIconDoubleClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
+      }
+    }
+
+    /// <summary>
+    /// Processes the close button click.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
+    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
+
+      _dialogResult = object.Equals( _button, MessageBoxButton.OK )
+                             ? MessageBoxResult.OK
+                             : MessageBoxResult.Cancel;
+
+      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
+      }
     }
 
     /// <summary>
@@ -765,39 +965,62 @@ private void Button_Click( object sender, RoutedEventArgs e )
       switch( button.Name )
       {
         case PART_NoButton:
-          MessageBoxResult = MessageBoxResult.No;
+          _dialogResult = MessageBoxResult.No;
+          this.Close();
           break;
         case PART_YesButton:
-          MessageBoxResult = MessageBoxResult.Yes;
-          break;
-        case PART_CloseButton:
-          MessageBoxResult = object.Equals( _button, MessageBoxButton.OK )
-                              ? MessageBoxResult.OK
-                              : MessageBoxResult.Cancel;
+          _dialogResult = MessageBoxResult.Yes;
+          this.Close();
           break;
         case PART_CancelButton:
-          MessageBoxResult = MessageBoxResult.Cancel;
+          _dialogResult = MessageBoxResult.Cancel;
+          this.Close();
           break;
         case PART_OkButton:
-          MessageBoxResult = MessageBoxResult.OK;
+          _dialogResult = MessageBoxResult.OK;
+          this.Close();
           break;
       }
 
       e.Handled = true;
-
-      Close();
     }
 
     /// <summary>
-    /// Closes the MessageBox.
+    /// Callack to the Container.Closed event
     /// </summary>
-    private void Close()
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void OnContainerClosed( object sender, EventArgs e )
+    {
+      this.Container.Closed -= this.OnContainerClosed;
+      this.Container.Content = null;
+      Debug.Assert( this.Container == null );
+      this.OnClose();
+    }
+
+    private void OnClose()
     {
-      Container.Close();
+      this.Visibility = Visibility.Collapsed;
+      this.OnClosed( EventArgs.Empty );
     }
 
     #endregion //Event Handlers
 
+    #region Events
+
+    /// <summary>
+    /// Occurs when the MessageBox is closed.
+    /// </summary>
+    public event EventHandler Closed;
+    protected virtual void OnClosed( EventArgs e )
+    {
+      if( Closed != null )
+        Closed( this, e );
+    }
+
+
+    #endregion
+
     #region COMMANDS
 
     private void ExecuteCopy( object sender, ExecutedRoutedEventArgs e )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
index 6b6d520ed..56b914132 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..cb81d8be4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,192 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+        <ResourceDictionary Source="../../Core/Themes/Aero2/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- MessageBox                                                                      -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="MessageBoxTemplate" TargetType="{x:Type local:MessageBox}">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="group1">
+                    <VisualState x:Name="OK">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="OKCancel">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="YesNo">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="YesNoCancel">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+
+            <prim:WindowControl x:Name="PART_WindowControl"
+                                    Caption="{TemplateBinding Caption}" 
+                                    CaptionForeground="{TemplateBinding CaptionForeground}"
+                                    CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                                    CaptionIcon="{TemplateBinding CaptionIcon}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    IsActive="{TemplateBinding IsActive}"
+                                    WindowBackground="{TemplateBinding WindowBackground}"
+                                    WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                    WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                    WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                    CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                                    WindowOpacity="{TemplateBinding WindowOpacity}">
+                <prim:WindowControl.Content>
+                    <Grid MinWidth="350">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Grid Margin="24,16,24,22">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <!-- Message Image -->
+                            <Image x:Name="MessageBoxImage" 
+                                       VerticalAlignment="Top" 
+                                       SnapsToDevicePixels="True" 
+                                       Stretch="None"
+                                       Source="{TemplateBinding ImageSource}" />
+
+                            <!-- Message Text -->
+                            <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                <TextBlock x:Name="MessageText" 
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center" 
+                                               MaxWidth="450" 
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}" 
+                                               FontSize="{TemplateBinding FontSize}" 
+                                               FontStyle="{TemplateBinding FontStyle}" 
+                                               FontWeight="{TemplateBinding FontWeight}" 
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Margin="10,0,0,0"/>
+                            </ScrollViewer>
+                        </Grid>
+
+                        <!-- Buttons -->
+                        <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}">
+                            <Grid HorizontalAlignment="Right" Margin="12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}" />
+                                <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}" />
+                                <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}" />
+                                <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" Style="{TemplateBinding CancelButtonStyle}" IsCancel="True" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </prim:WindowControl.Content>
+            </prim:WindowControl>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:MessageBox}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="MinWidth" Value="350" />
+        <Setter Property="MinHeight" Value="50" />
+        <Setter Property="MaxHeight" Value="250" />
+        <Setter Property="Template" Value="{StaticResource MessageBoxTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
index 969f5258d..abfcdba5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
@@ -1,282 +1,173 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Disabled">
-                            <Storyboard>
-                                <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".3"/>
-                                <DoubleAnimation Duration="0" Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity" To=".3"/>
-                            </Storyboard>
-                        </VisualState>
-                    </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <ResourceDictionary.MergedDictionaries>
+         <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
+         <ResourceDictionary Source="../../Core/Themes/Generic/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
    <!-- =============================================================================== -->
    <!-- MessageBox                                                                      -->
    <!-- =============================================================================== -->
 
-   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
-      <Border Background="Transparent" />
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:MessageBox}">
-      <Setter Property="Background" Value="#FFFFFFFF" />
-      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CaptionForeground" Value="#FF000000" />
-      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-      <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="IsEnabled" Value="true" />
-      <Setter Property="MinWidth" Value="350" />
-      <Setter Property="MinHeight" Value="50" />
-      <Setter Property="MaxHeight" Value="250" />
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="VerticalContentAlignment" Value="Top" />
-      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-      <Setter Property="WindowOpacity" Value="1.0" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:MessageBox}">
-               <Grid x:Name="Root">
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="group1">
+    <Style TargetType="{x:Type local:MessageBox}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="MinWidth" Value="350" />
+        <Setter Property="MinHeight" Value="50" />
+        <Setter Property="MaxHeight" Value="250" />
+        <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type local:MessageBox}">
+             <Grid>
+                <VisualStateManager.VisualStateGroups>
+                    <VisualStateGroup x:Name="group1">
                         <VisualState x:Name="OK">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
                         <VisualState x:Name="OKCancel">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
                         <VisualState x:Name="YesNo">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
-
                         <VisualState x:Name="YesNoCancel">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-
-                  <!-- Borders -->
-                  <Grid  x:Name="MessageBoxWindowGrid">
-                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,5,5" Opacity="{TemplateBinding WindowOpacity}" />
-                     <Grid Margin="0" Background="{x:Null}">
-                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,4,4" Opacity="{TemplateBinding WindowOpacity}" />
-                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,4,4" Margin="1" Opacity="0.7" />
-                     </Grid>
-                  </Grid>
-
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" MinHeight="26" />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-
-                     <!-- Content Border -->
-                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                        <Grid.RowDefinitions>
-                           <RowDefinition />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
-                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-
-                           <Grid MinWidth="350">
-                              <Grid.RowDefinitions>
-                                 <RowDefinition />
-                                 <RowDefinition Height="Auto" />
-                              </Grid.RowDefinitions>
-
-                              <Grid Margin="24,16,24,22">
-                                 <Grid.ColumnDefinitions>
+                        </VisualStateGroup>
+                </VisualStateManager.VisualStateGroups>
+
+                <prim:WindowControl x:Name="PART_WindowControl"
+                                    Caption="{TemplateBinding Caption}" 
+                                    CaptionForeground="{TemplateBinding CaptionForeground}"
+                                    CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                                    CaptionIcon="{TemplateBinding CaptionIcon}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    IsActive="{TemplateBinding IsActive}"
+                                    WindowBackground="{TemplateBinding WindowBackground}"
+                                    WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                    WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                    WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                    CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                                    WindowOpacity="{TemplateBinding WindowOpacity}">
+                    <prim:WindowControl.Content>
+                        <Grid MinWidth="350">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <Grid Margin="24,16,24,22">
+                                <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
-                                 </Grid.ColumnDefinitions>
-
-                                 <!-- Message Image -->
-                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
-
-                                 <!-- Message Text -->
-                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-                                    <TextBlock x:Name="MessageText"
+                                </Grid.ColumnDefinitions>
+
+                                <!-- Message Image -->
+                                <Image x:Name="MessageBoxImage" 
+                                       VerticalAlignment="Top" 
+                                       SnapsToDevicePixels="True" 
+                                       Stretch="None"
+                                       Source="{TemplateBinding ImageSource}" />
+
+                                <!-- Message Text -->
+                                <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText" 
                                                TextWrapping="Wrap"
-                                               VerticalAlignment="Center"
-                                               MaxWidth="450"
+                                               VerticalAlignment="Center" 
+                                               MaxWidth="450" 
                                                Text="{TemplateBinding Text}" 
-                                               FontFamily="{TemplateBinding FontFamily}"
-                                               FontSize="{TemplateBinding FontSize}"
-                                               FontStyle="{TemplateBinding FontStyle}"
-                                               FontWeight="{TemplateBinding FontWeight}"
-                                               Foreground="{TemplateBinding Foreground}" />
-                                 </ScrollViewer>
-
-                              </Grid>
-
-                              <!-- Buttons -->
-                              <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}" >
+                                               FontFamily="{TemplateBinding FontFamily}" 
+                                               FontSize="{TemplateBinding FontSize}" 
+                                               FontStyle="{TemplateBinding FontStyle}" 
+                                               FontWeight="{TemplateBinding FontWeight}" 
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Margin="10,0,0,0"/>
+                                </ScrollViewer>
+                            </Grid>
+
+                            <!-- Buttons -->
+                            <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}">
                                 <Grid HorizontalAlignment="Right" Margin="12">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -284,53 +175,20 @@
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}"/>
-                                    <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}"/>
-                                    <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}"/>
+
+                                    <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}" />
+                                    <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}" />
+                                    <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}" />
                                     <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" Style="{TemplateBinding CancelButtonStyle}" IsCancel="True" />
                                 </Grid>
-                              </Border>
-                           </Grid>
-                        </Border>
-                     </Grid>
-
-                     <!-- Header -->
-                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                        <Grid>
-                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                              <!-- Caption -->
-                              <ContentControl x:Name="Caption"
-                                              Margin="5,0,0,0"
-                                              IsTabStop="False"
-                                              HorizontalAlignment="Stretch"
-                                              Content="{TemplateBinding Caption}"
-                                              Foreground="{TemplateBinding CaptionForeground}" />
-                           </Grid>
-                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
-                        </Grid>
-                     </Border>
-
-                  </Grid>
-
-                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
-
-                  <!-- Close Button -->
-                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
-                        <Path Height="10"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Width="12"
-                              Fill="#E4FFFFFF"
-                              Stretch="Fill"
-                              Stroke="#FF535666" 
-                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
-                     </Button>
-                  </Border>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
+                            </Border>
+                         </Grid>
+                    </prim:WindowControl.Content>
+                </prim:WindowControl>
+              </Grid>
+           </ControlTemplate>
+        </Setter.Value>
       </Setter>
-   </Style>
+    </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 085bfec82..2b0ec3dac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -36,6 +36,7 @@ public class MultiLineTextEditor : ContentControl
 
     #region Properties
 
+    #region DropDownHeight
     public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
     public double DropDownHeight
     {
@@ -48,7 +49,9 @@ public double DropDownHeight
         SetValue( DropDownHeightProperty, value );
       }
     }
+    #endregion DropDownHeight
 
+    #region DropDownWidth
     public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
     public double DropDownWidth
     {
@@ -61,6 +64,7 @@ public double DropDownWidth
         SetValue( DropDownWidthProperty, value );
       }
     }
+    #endregion DropDownWidth
 
     #region IsOpen
 
@@ -91,6 +95,7 @@ protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
 
     #endregion //IsOpen
 
+    #region IsSpellCheckEnabled
     public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
     public bool IsSpellCheckEnabled
     {
@@ -103,7 +108,22 @@ public bool IsSpellCheckEnabled
         SetValue( IsSpellCheckEnabledProperty, value );
       }
     }
+    #endregion IsSpellCheckEnabled
 
+    #region IsReadOnly
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+    #endregion IsReadOnly
 
     #region Text
 
@@ -134,6 +154,7 @@ protected virtual void OnTextChanged( string oldValue, string newValue )
 
     #endregion //Text
 
+    #region TextAlignment
     public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
     public TextAlignment TextAlignment
     {
@@ -146,7 +167,9 @@ public TextAlignment TextAlignment
         SetValue( TextAlignmentProperty, value );
       }
     }
+    #endregion TextAlignment
 
+    #region TextWrapping
     public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
     public TextWrapping TextWrapping
     {
@@ -159,7 +182,7 @@ public TextWrapping TextWrapping
         SetValue( TextWrappingProperty, value );
       }
     }
-
+    #endregion TextWrapping
 
     #endregion //Properties
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..ff34c8e70
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,161 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="./../Images/Notes16.png" />
+
+    <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                                <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                            </Border>
+
+                            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </chrome:ButtonChrome>
+                        </Grid>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- MultiLineTextEditor                                                             -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:MultiLineTextEditor}">
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+                    <Grid x:Name="Root">
+                        <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                            <Border BorderThickness="1" Background="White" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <Grid>
+                                    <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    IsReadOnly="{TemplateBinding IsReadOnly}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                                    <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                                        <Thumb.Template>
+                                            <ControlTemplate TargetType="{x:Type Thumb}">
+                                                <Grid Background="Transparent">
+                                                    <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                                </Grid>
+                                            </ControlTemplate>
+                                        </Thumb.Template>
+                                    </Thumb>
+                                </Grid>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 42d8da4e0..97b07451a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -22,7 +22,7 @@
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Images/Notes16.png" />
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="./../Images/Notes16.png" />
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
       <GradientStop Color="#FFA3AEB9" Offset="0" />
@@ -142,6 +142,7 @@
                                     VerticalScrollBarVisibility="Auto"
                                     HorizontalScrollBarVisibility="Auto"
                                     SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    IsReadOnly="{TemplateBinding IsReadOnly}"
                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
                                     TextAlignment="{TemplateBinding TextAlignment}"
                                     Margin="3" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
index 42612bb97..5eb4628f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
index c8d814759..ac5edab59 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
index 81440d2e9..00ffdc3fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
@@ -1,23 +1,24 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Globalization;
 using System.IO;
+using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -70,6 +71,21 @@ protected CommonNumericUpDown( FromText fromText, FromDecimal fromDecimal, Func<
     protected static void UpdateMetadata( Type type, T? increment, T? minValue, T? maxValue )
     {
       DefaultStyleKeyProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( type ) );
+      UpdateMetadataCommon( type, increment, minValue, maxValue );
+    }
+
+    internal static void UpdateMetadataInternal( Type type, T? increment, T? minValue, T? maxValue )
+    {
+      // DefaultStyleKey for internal type (eg. UShortUpDown) must be a ComponentResourceKey instead
+      // of the type itself to allow external theme (ex. Office2007 theme) to redefine the default
+      // style of the control.
+      DefaultStyleKeyProperty.OverrideMetadata( type,
+        new FrameworkPropertyMetadata( new ComponentResourceKey( typeof( InputBase ), type.Name ) ) );
+      UpdateMetadataCommon( type, increment, minValue, maxValue );
+    }
+
+    private static void UpdateMetadataCommon( Type type, T? increment, T? minValue, T? maxValue )
+    {
       IncrementProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( increment ) );
       MaximumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( maxValue ) );
       MinimumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( minValue ) );
@@ -127,6 +143,11 @@ private bool HandleNullSpin()
       return false;
     }
 
+    internal bool IsValid( T? value )
+    {
+      return !IsLowerThan( value, Minimum ) && !IsGreaterThan( value, Maximum );
+    }
+
     private T? CoerceValueMinMax( T value )
     {
       if( IsLowerThan( value, Minimum ) )
@@ -175,6 +196,11 @@ protected override void OnDecrement()
         ? _fromDecimal( ParsePercent( text, CultureInfo ) )
         : _fromText( text, this.ParsingNumberStyle, CultureInfo );
 
+      if( this.ClipValueToMinMax )
+      {
+        return this.GetClippedMinMaxValue();
+      }
+
       ValidateDefaultMinMax( result );
 
       return result;
@@ -206,6 +232,19 @@ protected override void SetValidSpinDirection()
         Spinner.ValidSpinDirection = validDirections;
     }
 
+    private T? GetClippedMinMaxValue()
+    {
+      T? result = FormatString.Contains( "P" )
+                ? _fromDecimal( ParsePercent( this.Text, CultureInfo ) )
+                : _fromText( this.Text, this.ParsingNumberStyle, CultureInfo );
+
+      if( this.IsGreaterThan( result, this.Maximum ) )
+        return this.Maximum;
+      else if( this.IsLowerThan( result, this.Minimum ) )
+        return this.Minimum;
+      return result;
+    }
+
     private void ValidateDefaultMinMax( T? value )
     {
       // DefaultValue is always accepted.
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
index 73ee76606..0ae7d0ea9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
index 0a1068492..14b4be6f9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
index 833588cd2..544259f68 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
index d4f962091..3b8400c8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 517761a97..282ffdef1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
@@ -25,6 +25,23 @@ public abstract class NumericUpDown<T> : UpDownBase<T>
   {
     #region Properties
 
+    #region ClipValueToMinMax
+
+    public static readonly DependencyProperty ClipValueToMinMaxProperty = DependencyProperty.Register( "ClipValueToMinMax", typeof( bool ), typeof( NumericUpDown<T> ), new UIPropertyMetadata(false ) );
+    public bool ClipValueToMinMax
+    {
+      get
+      {
+        return ( bool )GetValue( ClipValueToMinMaxProperty );
+      }
+      set
+      {
+        SetValue( ClipValueToMinMaxProperty, value );
+      }
+    }
+
+    #endregion //ClipValueToMinMax
+
     #region FormatString
 
     public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
index 7f2e638d5..0802d0faa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class SByteUpDown : CommonNumericUpDown<sbyte>
 
     static SByteUpDown()
     {
-      UpdateMetadata( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
+      UpdateMetadataInternal( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
     }
 
     public SByteUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
index 4fd33f022..50afebaeb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
index 9575b4c2a..a1a095b79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -27,7 +27,7 @@ public class SingleUpDown : CommonNumericUpDown<float>
 
     static SingleUpDown()
     {
-      UpdateMetadata( typeof( SingleUpDown ), 1f, float.PositiveInfinity, float.NegativeInfinity );
+      UpdateMetadata( typeof( SingleUpDown ), 1f, float.NegativeInfinity, float.PositiveInfinity );
     }
 
     public SingleUpDown()
@@ -92,7 +92,7 @@ protected override float DecrementValue( float value, float increment )
 
     protected override void SetValidSpinDirection()
     {
-      if( Value.HasValue && float.IsInfinity( Value.Value ) )
+      if( Value.HasValue && float.IsInfinity( Value.Value ) && ( Spinner != null ) )
       {
         Spinner.ValidSpinDirection = ValidSpinDirections.None;
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
index 625bdd8a8..3a22829c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class UIntegerUpDown : CommonNumericUpDown<uint>
 
     static UIntegerUpDown()
     {
-      UpdateMetadata( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
+      UpdateMetadataInternal( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
     }
 
     public UIntegerUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
index f0d8fe4b3..f7c71d1c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class ULongUpDown : CommonNumericUpDown<ulong>
 
     static ULongUpDown()
     {
-      UpdateMetadata( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
+      UpdateMetadataInternal( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
     }
 
     public ULongUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
index a9e936641..5d1e5e0fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class UShortUpDown : CommonNumericUpDown<ushort>
 
     static UShortUpDown()
     {
-      UpdateMetadata( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
+      UpdateMetadataInternal( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
     }
 
     public UShortUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c7c894a1b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,168 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="NumericUpDown" TargetType="{x:Type prim:InputBase}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Control">
+                    <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="{TemplateBinding Background}"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </local:ButtonSpinner>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- DecimalUpDown                                                                   -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- DoubleUpDown                                                                    -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- IntegerUpDown                                                                   -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- ShortUpDown                                                                     -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:ShortUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- LongUpDown                                                                      -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:LongUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- ByteUpDown                                                                      -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:ByteUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- SingleUpDown                                                                    -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:SingleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- Style for all internal derived types of NumericUpDown must have a               -->
+   <!-- ComponentResourceKey key to allow external theme to redefine the default style  -->
+   <!-- (ex. Office2007 theme)                                                          -->
+   <!-- =============================================================================== -->
+
+   <!-- =============================================================================== -->
+   <!-- SByteUpDown                                                                     -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=SByteUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- UIntegerUpDown                                                                  -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UIntegerUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- ULongUpDown                                                                     -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=ULongUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- UShortUpDown                                                                    -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UShortUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
index f86d5f5fb..1c97451b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -1,47 +1,50 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <Style x:Key="NumericUpDown" TargetType="{x:Type prim:InputBase}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
       <Setter Property="BorderThickness" Value="1" />
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
       <Setter Property="HorizontalContentAlignment" Value="Right" />
       <Setter Property="IsTabStop" Value="False" />
       <Setter Property="VerticalContentAlignment" Value="Center" />
       <Setter Property="TextAlignment" Value="Right" />
-      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />      
-      <Setter Property="Template">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="Control">
                <local:ButtonSpinner x:Name="PART_Spinner"
                                     IsTabStop="False"
                                     Background="{TemplateBinding Background}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
                                     ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
                         <local:WatermarkTextBox x:Name="PART_TextBox"
@@ -58,7 +61,7 @@
                                           IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
                                           MinWidth="20"
                                           AcceptsReturn="False"
-                                          Padding="0"
+                                          Padding="{TemplateBinding Padding}"
                                           SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
                                           TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
                                           TextWrapping="NoWrap" 
@@ -71,6 +74,9 @@
                   <Trigger Property="IsEnabled" Value="False">
                      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                   </Trigger>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
@@ -112,25 +118,43 @@
    <!-- =============================================================================== -->
    <Style TargetType="{x:Type local:SingleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
 
+   <!-- =============================================================================== -->
+   <!-- Style for all internal derived types of NumericUpDown must have a               -->
+   <!-- ComponentResourceKey key to allow external theme to redefine the default style  -->
+   <!-- (ex. Office2007 theme)                                                          -->
+   <!-- =============================================================================== -->
+
    <!-- =============================================================================== -->
    <!-- SByteUpDown                                                                     -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:SByteUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=SByteUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- UIntegerUpDown                                                                  -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:UIntegerUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UIntegerUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- ULongUpDown                                                                     -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:ULongUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=ULongUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- UShortUpDown                                                                    -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:UShortUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UShortUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
index a932ec5f1..46e0127c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index 703929ee2..38dd9addc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
index b928597f9..538628fea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
index 435c98523..3d051719d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using Xceed.Wpf.Toolkit.Media.Animation;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
index a30c06a91..a89d5edf9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
index cdfeeeeb0..ab5f4e856 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
index 5800a852b..66d4acac6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
index b37f2fdd6..d0fb56c1c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
index f8ddef7e7..a1dd43b0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
index f1d8e2fe1..64faa9e48 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
index ce49d65a0..7d7d53b73 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
index 890c74013..e04105227 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
index 08bffe65b..4a6af9b2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
index 562a0fe6c..1d079e2a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
index 8835db3c7..3217f008e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
index 70d34454c..7a023c235 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
@@ -1,23 +1,22 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
@@ -27,8 +26,10 @@ public class RandomPanel : AnimationPanel
 
     public static readonly DependencyProperty MinimumWidthProperty =
       DependencyProperty.Register( "MinimumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 10d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          10d,
+          new PropertyChangedCallback( RandomPanel.OnMinimumWidthChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMinimumWidth ) ) );
 
     public double MinimumWidth
     {
@@ -42,14 +43,39 @@ public double MinimumWidth
       }
     }
 
+    private static void OnMinimumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MaximumWidthProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMinimumWidth( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double maximum = panel.MaximumWidth;
+      if( value > maximum )
+        return maximum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MinimumHeight Property
 
     public static readonly DependencyProperty MinimumHeightProperty =
       DependencyProperty.Register( "MinimumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 10d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          10d,
+          new PropertyChangedCallback( RandomPanel.OnMinimumHeightChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMinimumHeight ) ) );
 
     public double MinimumHeight
     {
@@ -63,14 +89,39 @@ public double MinimumHeight
       }
     }
 
+    private static void OnMinimumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MaximumHeightProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMinimumHeight( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double maximum = panel.MaximumHeight;
+      if( value > maximum )
+        return maximum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MaximumWidth Property
 
     public static readonly DependencyProperty MaximumWidthProperty =
       DependencyProperty.Register( "MaximumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 100d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          100d,
+          new PropertyChangedCallback( RandomPanel.OnMaximumWidthChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMaximumWidth ) ) );
 
     public double MaximumWidth
     {
@@ -84,14 +135,39 @@ public double MaximumWidth
       }
     }
 
+    private static void OnMaximumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MinimumWidthProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMaximumWidth( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double minimum = panel.MinimumWidth;
+      if( value < minimum )
+        return minimum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MaximumHeight Property
 
     public static readonly DependencyProperty MaximumHeightProperty =
       DependencyProperty.Register( "MaximumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 100d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          100d,
+          new PropertyChangedCallback( RandomPanel.OnMaximumHeightChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMaximumHeight ) ) );
 
     public double MaximumHeight
     {
@@ -105,13 +181,36 @@ public double MaximumHeight
       }
     }
 
+    private static void OnMaximumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MinimumHeightProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMaximumHeight( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double minimum = panel.MinimumHeight;
+      if( value < minimum )
+        return minimum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region Seed Property
 
     public static readonly DependencyProperty SeedProperty =
       DependencyProperty.Register( "Seed", typeof( int ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 0, 
+        new FrameworkPropertyMetadata( 0,
           new PropertyChangedCallback( RandomPanel.SeedChanged ) ) );
 
     public int Seed
@@ -142,7 +241,7 @@ private static void SeedChanged( DependencyObject obj, DependencyPropertyChanged
 
     // Using a DependencyProperty as the backing store for ActualSize.  This enables animation, styling, binding, etc...
     private static readonly DependencyProperty ActualSizeProperty =
-      DependencyProperty.RegisterAttached( "ActualSize", typeof( Size ), typeof( RandomPanel ), 
+      DependencyProperty.RegisterAttached( "ActualSize", typeof( Size ), typeof( RandomPanel ),
         new UIPropertyMetadata( new Size() ) );
 
     private static Size GetActualSize( DependencyObject obj )
@@ -167,7 +266,8 @@ protected override Size MeasureChildrenOverride( UIElementCollection children, S
           continue;
 
         Size childSize = new Size( 1d * _random.Next( Convert.ToInt32( MinimumWidth ), Convert.ToInt32( MaximumWidth ) ),
-                                    1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
+                                   1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
+
         child.Measure( childSize );
         RandomPanel.SetActualSize( child, childSize );
       }
@@ -194,17 +294,6 @@ protected override Size ArrangeChildrenOverride( UIElementCollection children, S
       return finalSize;
     }
 
-    private static void OnInvalidateMeasure( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = d as RandomPanel;
-      if( panel.MinimumWidth > panel.MaximumWidth )
-        throw new InvalidDataException( "MinWidth can't be greater than MaxWidth." );
-      else if( panel.MinimumHeight > panel.MaximumHeight )
-        throw new InvalidDataException( "MinHeight can't be greater than MaxHeight." );
-      else
-        ( ( AnimationPanel )d ).InvalidateMeasure();
-    }
-
     #region Private Fields
 
     private Random _random = new Random();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
index 60893c21a..523041aa3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
index 60f81d0eb..c5a05da15 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
index 3c192f92c..b4585aa75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
index 9b2e394fe..01c66fe26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Threading;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
index 232204894..d99909abd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
index ba2fa6e7b..febf9c185 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Specialized;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
index feadce5b3..583e4ab55 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index c417e0371..6e5a09534 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 #region Using directives
 
@@ -36,7 +36,7 @@ This program is provided to you under the terms of the Microsoft Public
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
 [assembly: AssemblyProduct( "Xceed Extended WPF Toolkit" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
 [assembly: AssemblyCulture( "" )]
 
 
@@ -72,6 +72,7 @@ This program is provided to you under the terms of the Microsoft Public
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Media")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Utilities")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Chromes")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
@@ -86,7 +87,7 @@ This program is provided to you under the terms of the Microsoft Public
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"sn.snk" )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
index 1f7a7c6d9..71907a5c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
index ffbd0ece7..512685fca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
index 3390129e9..420ce78e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
new file mode 100644
index 000000000..0c1179d95
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
@@ -0,0 +1,45 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  /// <summary>
+  /// This attribute can decorate the collection properties (i.e., IList) 
+  /// of your selected object in order to control the types that will be allowed
+  /// to be instantiated in the CollectionControl.
+  /// </summary>
+  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
+  public class NewItemTypesAttribute : Attribute
+  {
+    public IList<Type> Types
+    {
+      get;
+      set;
+    }
+
+    public NewItemTypesAttribute( params Type[] types )
+    {
+      this.Types = new List<Type>( types );
+    }
+
+    public NewItemTypesAttribute()
+    {
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
index 87f2511e4..4e34c4637 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
index 47298a296..b7ecb93af 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
index 384b9b8cd..c6ef65982 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
new file mode 100644
index 000000000..7e656da3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
@@ -0,0 +1,58 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Globalization;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class CommonPropertyExceptionValidationRule : ValidationRule
+  {
+    private TypeConverter _propertyTypeConverter;
+    private Type _type;
+
+    internal CommonPropertyExceptionValidationRule( Type type )
+    {
+      _propertyTypeConverter = TypeDescriptor.GetConverter( type );
+      _type = type;
+    }
+
+    public override ValidationResult Validate( object value, CultureInfo cultureInfo )
+    {
+      ValidationResult result = new ValidationResult( true, null );
+
+      if( GeneralUtilities.CanConvertValue( value, _type ) )
+      {
+        try
+        {
+          _propertyTypeConverter.ConvertFrom( value );
+        }
+        catch( Exception e )
+        {
+          // Will display a red border in propertyGrid
+          result = new ValidationResult( false, e.Message );
+        }
+      }
+      return result;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
new file mode 100644
index 000000000..83e6f6982
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
@@ -0,0 +1,196 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections;
+using System;
+using System.Windows;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Windows.Data;
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal abstract class ContainerHelperBase
+  {
+    protected readonly IPropertyContainer PropertyContainer;
+
+    public ContainerHelperBase(IPropertyContainer propertyContainer)
+    {
+      if( propertyContainer == null )
+        throw new ArgumentNullException( "propertyContainer" );
+
+      PropertyContainer = propertyContainer;
+
+      var propChange = propertyContainer as INotifyPropertyChanged;
+      if( propChange != null )
+      {
+        propChange.PropertyChanged += new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
+      }
+    }
+
+    #region IsGenerated attached property
+
+    internal static readonly DependencyProperty IsGeneratedProperty = DependencyProperty.RegisterAttached(
+      "IsGenerated",
+      typeof( bool ),
+      typeof( ContainerHelperBase ),
+      new PropertyMetadata( false ) );
+
+    internal static bool GetIsGenerated( DependencyObject obj )
+    {
+      return ( bool )obj.GetValue( ContainerHelperBase.IsGeneratedProperty );
+    }
+
+    internal static void SetIsGenerated( DependencyObject obj, bool value )
+    {
+      obj.SetValue( ContainerHelperBase.IsGeneratedProperty, value );
+    }
+
+    #endregion IsGenerated attached property
+
+    public abstract IList Properties
+    {
+      get;
+    }
+
+    internal ItemsControl ChildrenItemsControl
+    {
+      get;
+      set;
+    }
+
+    public virtual void ClearHelper()
+    {
+      var propChange = PropertyContainer as INotifyPropertyChanged;
+      if( propChange != null )
+      {
+        propChange.PropertyChanged -= new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
+      }
+
+      // Calling RemoveAll() will force the ItemsContol displaying the
+      // properties to clear all the current container (i.e., ClearContainerForItem).
+      // This will make the call at "ClearChildrenPropertyItem" for every prepared
+      // container. Fortunately, the ItemsContainer will not re-prepare the items yet
+      // (i.e., probably made on next measure pass), allowing us to set up the new
+      // parent helper.
+      if( ChildrenItemsControl != null )
+      {
+        ( ( IItemContainerGenerator )ChildrenItemsControl.ItemContainerGenerator ).RemoveAll();
+      }
+    }
+
+    public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) 
+    {
+      // Initialize the parent node
+      propertyItem.ParentNode = PropertyContainer;
+
+      PropertyGrid.RaisePreparePropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
+    }
+
+    public virtual void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+
+      propertyItem.ParentNode = null;
+
+      PropertyGrid.RaiseClearPropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
+    }
+
+    protected FrameworkElement GenerateCustomEditingElement( Type definitionKey, PropertyItemBase propertyItem )
+    {
+      FrameworkElement editor = null;
+
+      if( PropertyContainer.EditorDefinitions != null )
+      {
+        // If no editor for the current type, fall back on base type editor recursively.
+        while( editor == null && definitionKey != null )
+        {
+          editor = this.CreateCustomEditor( PropertyContainer.EditorDefinitions[ definitionKey ], propertyItem );
+          definitionKey = definitionKey.BaseType;
+        }
+      }
+
+      return editor;
+    }
+
+    protected FrameworkElement GenerateCustomEditingElement( object definitionKey, PropertyItemBase propertyItem )
+    {
+      return ( PropertyContainer.EditorDefinitions != null )
+        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions[ definitionKey ], propertyItem )
+        : null;
+    }
+
+    protected FrameworkElement CreateCustomEditor( EditorDefinitionBase customEditor, PropertyItemBase propertyItem )
+    {
+      return ( customEditor != null )
+        ? customEditor.GenerateEditingElementInternal( propertyItem )
+        : null;
+    }
+
+    protected virtual void OnPropertyContainerPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      var propertyName = e.PropertyName;
+      IPropertyContainer ps = null;
+      if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.FilterInfo ) )
+      {
+        this.OnFilterChanged();
+      }
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.IsCategorized ) )
+      {
+        this.OnCategorizationChanged();
+      }
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.AutoGenerateProperties ) )
+      {
+        this.OnAutoGeneratePropertiesChanged();
+      }
+      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ))
+      {
+        this.OnEditorDefinitionsChanged();
+      }
+      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ))
+      {
+        this.OnPropertyDefinitionsChanged();
+      }
+    }
+
+    protected virtual void OnCategorizationChanged() { }
+
+    protected virtual void OnFilterChanged() { }
+
+    protected virtual void OnAutoGeneratePropertiesChanged() { }
+
+    protected virtual void OnEditorDefinitionsChanged() { }
+
+    protected virtual void OnPropertyDefinitionsChanged() { }
+
+    public virtual void OnEndInit() { }
+
+    public abstract PropertyItemBase ContainerFromItem( object item );
+
+    public abstract object ItemFromContainer( PropertyItemBase container );
+
+    public abstract Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem );
+
+    public virtual void NotifyEditorDefinitionsCollectionChanged() { }
+    public virtual void NotifyPropertyDefinitionsCollectionChanged() { }
+
+    public abstract void UpdateValuesFromSource();
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
new file mode 100644
index 000000000..669e01d11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  /// <summary>
+  /// Converts a TimeSpan value to a DateTime value.
+  /// 
+  /// This converter can be used in conjunction with a TimePicker in order 
+  /// to create a TimeSpan edit control. 
+  /// </summary>
+  public sealed class EditorTimeSpanConverter : IValueConverter
+  {
+    public bool AllowNulls { get; set; }
+
+    object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( this.AllowNulls && value == null )
+        return null;
+
+      TimeSpan timeSpan = ( value != null ) ? ( TimeSpan )value : TimeSpan.Zero;
+      return DateTime.Today + timeSpan;
+    }
+
+    object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( this.AllowNulls && value == null )
+        return null;
+
+      return ( value != null )
+        ? ( ( DateTime )value ).TimeOfDay
+        : TimeSpan.Zero;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
index d625a2826..c2e686146 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
new file mode 100644
index 000000000..ad71a2db1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
@@ -0,0 +1,105 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  internal class ListConverter : TypeConverter
+  {
+    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
+    {
+      return true;
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
+    {
+      return ( destinationType == typeof( string ) );
+    }
+
+    public override object ConvertFrom( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value )
+    {
+      if( value == null )
+        return null;
+
+      string names = value as string;
+
+      var list = new List<object>();
+      if( names == null && value != null )
+      {
+        list.Add( value );
+      }
+      else
+      {
+        if( names == null )
+          return null;
+
+        foreach( var name in names.Split( ',' ) )
+        {
+          list.Add( name.Trim() );
+        }
+      }
+
+      return new ReadOnlyCollection<object>( list );
+    }
+
+    public override object ConvertTo( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType )
+    {
+      if( destinationType != typeof( string ) )
+        throw new InvalidOperationException( "Can only convert to string." );
+
+
+      IList strs = ( IList )value;
+
+      if( strs == null )
+        return null;
+
+      StringBuilder sb = new StringBuilder();
+      bool first = true;
+      foreach( object o in strs )
+      {
+        if( o == null )
+          throw new InvalidOperationException( "Property names cannot be null." );
+
+        string s = o as string;
+        if( s == null )
+          throw new InvalidOperationException( "Does not support serialization of non-string property names." );
+
+        if( s.Contains( ',' ) )
+          throw new InvalidOperationException( "Property names cannot contain commas." );
+
+        if( s.Trim().Length != s.Length )
+          throw new InvalidOperationException( "Property names cannot start or end with whitespace characters." );
+
+        if( !first )
+        {
+          sb.Append( ", " );
+        }
+        first = false;
+
+        sb.Append( s );
+      }
+
+      return sb.ToString();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
index ac6aa9f6e..972558d4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
new file mode 100644
index 000000000..eb02a6c11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
@@ -0,0 +1,99 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// Used when properties are provided using a list source of items (eg. Properties or PropertiesSource). 
+  /// 
+  /// An instance of this class can be used as an item to easily customize the 
+  /// display of the property directly by modifying the values of this class 
+  /// (e.g., DisplayName, value, Category, etc.).
+  /// </summary>
+  public class CustomPropertyItem : PropertyItemBase
+  {
+
+    internal CustomPropertyItem() { }
+
+    #region Category
+
+    public static readonly DependencyProperty CategoryProperty =
+        DependencyProperty.Register( "Category", typeof( string ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null ) );
+
+    public string Category
+    {
+      get { return ( string )GetValue( CategoryProperty ); }
+      set { SetValue( CategoryProperty, value ); }
+    }
+
+    #endregion //Category
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null, OnValueChanged, OnCoerceValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static object OnCoerceValueChanged( DependencyObject o, object baseValue )
+    {
+      CustomPropertyItem prop = o as CustomPropertyItem;
+      if( prop != null )
+        return prop.OnCoerceValueChanged( baseValue );
+
+      return baseValue;
+    }
+
+    protected virtual object OnCoerceValueChanged( object baseValue )
+    {
+      return baseValue;
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CustomPropertyItem propertyItem = o as CustomPropertyItem;
+      if( propertyItem != null )
+      {
+        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+      }
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( IsInitialized )
+      {
+        RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+      }
+    }
+
+    #endregion //Value
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
new file mode 100644
index 000000000..6d28674a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
@@ -0,0 +1,58 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public abstract class EditorDefinitionBase : PropertyDefinitionBase
+  {
+
+    internal EditorDefinitionBase() { }
+
+    internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) 
+    {
+      return this.GenerateEditingElement( propertyItem );
+    }
+
+    protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) { return null; }
+
+    internal void UpdateProperty( FrameworkElement element, DependencyProperty elementProp, DependencyProperty definitionProperty )
+    {
+      object currentValue = this.GetValue( definitionProperty );
+      object localValue = this.ReadLocalValue( definitionProperty );
+      // Avoid setting values if it does not affect anything 
+      // because setting a local value may prevent a style setter from being active.
+      if( ( localValue != DependencyProperty.UnsetValue )
+        || currentValue != element.GetValue( elementProp ) )
+      {
+        element.SetValue( elementProp, currentValue );
+      }
+      else
+      {
+        element.ClearValue( elementProp );
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
new file mode 100644
index 000000000..3449f5bfb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
@@ -0,0 +1,47 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorTemplateDefinition : EditorDefinitionBase
+  {
+
+
+    #region EditingTemplate
+    public static readonly DependencyProperty EditingTemplateProperty =
+        DependencyProperty.Register( "EditingTemplate", typeof( DataTemplate ), typeof( EditorTemplateDefinition ), new UIPropertyMetadata( null ) );
+
+    public DataTemplate EditingTemplate
+    {
+      get { return ( DataTemplate )GetValue( EditingTemplateProperty ); }
+      set { SetValue( EditingTemplateProperty, value ); }
+    }
+    #endregion //EditingTemplate
+
+    protected override sealed FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem )
+    {
+      return ( this.EditingTemplate != null )
+        ? this.EditingTemplate.LoadContent() as FrameworkElement
+        : null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
new file mode 100644
index 000000000..b09a190f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
@@ -0,0 +1,85 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public abstract class PropertyDefinitionBase : DependencyObject
+  {
+    private IList _targetProperties;
+    private bool _isLocked;
+
+    internal PropertyDefinitionBase()
+    {
+      _targetProperties = new List<object>();
+    }
+
+    [TypeConverter(typeof(ListConverter))]
+    public IList TargetProperties 
+    {
+      get { return _targetProperties; }
+      set 
+      {
+        if( this.IsLocked )
+          throw new InvalidOperationException( @"Cannot modify TargetProperties once the definition has beed added to a collection." );
+
+        _targetProperties = value; 
+      }
+    }
+
+    internal bool IsLocked
+    {
+      get{ return _isLocked; }
+    }
+
+    internal virtual void Lock()
+    {
+      if( this.IsLocked )
+        return;
+
+      // Just create a new copy of the properties target to ensure 
+      // that the list doesn't ever get modified.
+
+      List<object> newList = new List<object>();
+      if( _targetProperties != null )
+      {
+        foreach( object p in _targetProperties )
+        {
+          object prop = p;
+          // Convert all TargetPropertyType to Types
+          var targetType = prop as TargetPropertyType;
+          if( targetType != null )
+          {
+            prop = targetType.Type;
+          }
+          newList.Add( prop );
+        }
+      }
+
+      _targetProperties = new ReadOnlyCollection<object>( newList );
+      _isLocked = true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index 1b4edbd12..b64c2daec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -28,7 +28,7 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
 using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
+using System.Reflection;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -36,6 +36,7 @@ internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
   {
     #region Members
 
+    private readonly object _selectedObject;
     private readonly PropertyDescriptor _propertyDescriptor;
     private readonly DependencyPropertyDescriptor _dpDescriptor;
     private readonly MarkupObject _markupObject;
@@ -44,22 +45,25 @@ internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
 
     #region Constructor
 
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, IPropertyParent propertyParent )
-      : base( propertyParent )
+    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject )
     {
       if( propertyDescriptor == null )
         throw new ArgumentNullException( "propertyDescriptor" );
 
+      if( selectedObject == null )
+        throw new ArgumentNullException( "selectedObject" );
+
       _propertyDescriptor = propertyDescriptor;
+      _selectedObject = selectedObject;
       _dpDescriptor = DependencyPropertyDescriptor.FromProperty( propertyDescriptor );
-      _markupObject = MarkupWriter.GetMarkupObjectFor( _propertyParent.ValueInstance );
+      _markupObject = MarkupWriter.GetMarkupObjectFor( SelectedObject );
     }
 
     #endregion
 
     #region Custom Properties
 
-    public PropertyDescriptor PropertyDescriptor
+    internal override PropertyDescriptor PropertyDescriptor
     {
       get
       {
@@ -67,58 +71,45 @@ public PropertyDescriptor PropertyDescriptor
       }
     }
 
+    private object SelectedObject
+    {
+      get
+      {
+        return _selectedObject;
+      }
+    }
+
     #endregion
 
     #region Override Methods
 
-    protected override void SetBinding()
+    protected override BindingBase CreateValueBinding()
     {
       //Bind the value property with the source object.
       var binding = new Binding( PropertyDescriptor.Name )
       {
-        Source = _propertyParent.ValueInstance,
+        Source = SelectedObject,
         Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
         ValidatesOnDataErrors = true,
         ValidatesOnExceptions = true
       };
 
-      BindingOperations.SetBinding( this, DescriptorPropertyDefinition.ValueProperty, binding );
-    }
-
-
-    protected override string GetPropertyName()
-    {
-      return PropertyDescriptor.Name;
-    }
-
-    protected override Type GetPropertyType()
-    {
-      return PropertyDescriptor.PropertyType;
-    }
-
-    protected override string GetPropertyDisplayName()
-    {
-      return PropertyDescriptor.DisplayName;
+      return binding;
     }
 
-    protected override bool IsPropertyDescriptorReadOnly()
+    protected override bool ComputeIsReadOnly()
     {
       return PropertyDescriptor.IsReadOnly;
     }
 
-    internal override PropertyDescriptor GetPropertyDescriptor()
-    {
-      return PropertyDescriptor;
-    }
-
-    protected override ITypeEditor CreateDefaultEditor()
+    internal override ITypeEditor CreateDefaultEditor()
     {
       return PropertyGridUtilities.CreateDefaultEditor( PropertyDescriptor.PropertyType, PropertyDescriptor.Converter );
     }
 
     protected override bool ComputeCanResetValue()
     {
-      return PropertyDescriptor.CanResetValue( _propertyParent.ValueInstance )
+      return PropertyDescriptor.CanResetValue( SelectedObject )
         && !PropertyDescriptor.IsReadOnly;
     }
 
@@ -126,7 +117,7 @@ protected override AdvancedOptionsValues ComputeAdvancedOptionsValues()
     {
       string imageName;
       object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, _propertyParent.ValueInstance as DependencyObject, _dpDescriptor, out imageName, out tooltip );
+      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out imageName, out tooltip );
 
       return CreateAdvanceOptionValues( imageName, tooltip );
     }
@@ -153,61 +144,41 @@ protected override bool ComputeIsExpandable()
       return isExpandable;
     }
 
+    protected override IList<Type> ComputeNewItemTypes()
+    {
+      return ( IList<Type> )ComputeNewItemTypesForItem( PropertyDescriptor );
+    }
     protected override string ComputeDescription()
     {
-      return ( string )ComputeDescriptionForItem( GetPropertyDescriptor() );
+      return ( string )ComputeDescriptionForItem( PropertyDescriptor );
     }
 
     protected override int ComputeDisplayOrder()
     {
-      return ( int )ComputeDisplayOrderForItem( GetPropertyDescriptor() );
-    }
-
-    protected override IEnumerable<IPropertyDefinition> GenerateChildrenProperties()
-    {
-      object value = this.ValueInstance;
-
-      if( value == null )
-        return new IPropertyDefinition[ 0 ];
-
-      var propertyDefs = new List<IPropertyDefinition>();
-
-      try
-      {
-        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( value );
-
-        foreach( PropertyDescriptor descriptor in descriptors )
-        {
-          if( descriptor.IsBrowsable )
-          {
-            DescriptorPropertyDefinition def = new DescriptorPropertyDefinition( descriptor, this );
-            def.InitProperties();
-            propertyDefs.Add( def );
-          }
-        }
-      }
-      catch( Exception )
-      {
-        //TODO: handle this some how
-      }
-
-      return propertyDefs;
+      return ( int )ComputeDisplayOrderForItem( PropertyDescriptor );
     }
 
     protected override void ResetValue()
     {
-      PropertyDescriptor.ResetValue( _propertyParent.ValueInstance );
+      PropertyDescriptor.ResetValue( SelectedObject );
     }
 
-    protected override ITypeEditor GetAttributeEditor()
+    internal override ITypeEditor CreateAttributeEditor()
     {
       var editorAttribute = GetAttribute<EditorAttribute>();
       if( editorAttribute != null )
       {
         Type type = Type.GetType( editorAttribute.EditorTypeName );
-        var instance = Activator.CreateInstance( type );
-        if( instance is ITypeEditor )
-          return ( ITypeEditor )instance;
+
+        // If the editor does not have any public parameterless constructor, forget it.
+        if( typeof( ITypeEditor ).IsAssignableFrom( type )
+          && ( type.GetConstructor( new Type[ 0 ] ) != null ) )
+        {
+          var instance = Activator.CreateInstance( type ) as ITypeEditor;
+          Debug.Assert( instance != null, "Type was expected to be ITypeEditor with public constructor." );
+          if( instance != null )
+            return instance;
+        }
       }
 
       var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
index 33ef7e9a3..3ef65525d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -31,36 +31,29 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media.Imaging;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Implementation
+namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  internal class DescriptorPropertyDefinitionBase : DependencyObject, IPropertyDefinition, IPropertyParent
+  internal abstract class DescriptorPropertyDefinitionBase : DependencyObject
   {
     #region Members
 
-    internal readonly IPropertyParent _propertyParent;
     private string _category;
     private string _categoryValue;
     private string _description;
     private string _displayName;
     private int _displayOrder;
     private bool _isExpandable;
+    private bool _isReadOnly;
+    private IList<Type> _newItemTypes;
     private IEnumerable<CommandBinding> _commandBindings;
-    private IEnumerable<IPropertyDefinition> _children;
 
     #endregion
 
-    #region Constructors
-
-    internal DescriptorPropertyDefinitionBase( IPropertyParent propertyParent )
+    internal abstract PropertyDescriptor PropertyDescriptor
     {
-      if( propertyParent == null )
-        throw new ArgumentNullException( "propertyParent" );
-
-      _propertyParent = propertyParent;
+      get;
     }
 
-    #endregion
-
     #region Virtual Methods
 
     protected virtual string ComputeCategory()
@@ -77,7 +70,6 @@ protected virtual string ComputeDescription()
     {
       return null;
     }
-
     protected virtual int ComputeDisplayOrder()
     {
       return int.MaxValue;
@@ -88,12 +80,14 @@ protected virtual bool ComputeIsExpandable()
       return false;
     }
 
-    protected virtual void ResetValue()
+    protected virtual IList<Type> ComputeNewItemTypes()
     {
+      return null;
     }
 
-    protected virtual void SetBinding()
+    protected virtual bool ComputeIsReadOnly()
     {
+      return false;
     }
 
     protected virtual bool ComputeCanResetValue()
@@ -101,11 +95,6 @@ protected virtual bool ComputeCanResetValue()
       return false;
     }
 
-    protected virtual IEnumerable<IPropertyDefinition> GenerateChildrenProperties()
-    {
-      return null;
-    }
-
     protected virtual AdvancedOptionsValues ComputeAdvancedOptionsValues()
     {
       return new AdvancedOptionsValues()
@@ -115,46 +104,26 @@ protected virtual AdvancedOptionsValues ComputeAdvancedOptionsValues()
       };
     }
 
-    protected virtual ITypeEditor GetAttributeEditor()
-    {
-      return null;
-    }
-
-    protected virtual string GetPropertyName()
+    protected virtual void ResetValue()
     {
-      return null;
     }
 
-    protected virtual Type GetPropertyType()
-    {
-      return null;
-    }
+    protected abstract BindingBase CreateValueBinding();
 
-    protected virtual string GetPropertyDisplayName()
-    {
-      return null;
-    }
+    #endregion
 
-    protected virtual bool IsPropertyDescriptorReadOnly()
-    {
-      return false;
-    }
+    #region Internal Methods
 
-    protected virtual ITypeEditor CreateDefaultEditor()
+    internal virtual ITypeEditor CreateDefaultEditor()
     {
       return null;
     }
 
-    internal virtual PropertyDescriptor GetPropertyDescriptor()
+    internal virtual ITypeEditor CreateAttributeEditor()
     {
       return null;
     }
 
-
-    #endregion
-
-    #region Internal Methods
-
     internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor, 
                                                 out string imageName, out object tooltip )
     {
@@ -164,7 +133,7 @@ internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, Dependency
       bool isResource = false;
       bool isDynamicResource = false;
 
-      var markupProperty = markupObject.Properties.Where( p => p.Name == GetPropertyName() ).FirstOrDefault();
+      var markupProperty = markupObject.Properties.Where( p => p.Name == PropertyName ).FirstOrDefault();
       if( markupProperty != null )
       {
         //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
@@ -220,11 +189,11 @@ internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, Dependency
 
     internal AdvancedOptionsValues CreateAdvanceOptionValues( string imageName, object tooltip )
     {
-      string uriPrefix = "/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/";
+      string uriPrefix = "../Images/";
 
       AdvancedOptionsValues values = new AdvancedOptionsValues();
       values.Tooltip = tooltip;
-      values.ImageSource = new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.RelativeOrAbsolute ) );
+      values.ImageSource = new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.Relative ) );
 
       return values;
     }
@@ -236,6 +205,11 @@ internal void UpdateAdvanceOptions()
       AdvancedOptionsTooltip = advancedOptions.Tooltip;
     }
 
+    internal void UpdateValueFromSource()
+    {
+      BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinitionBase.ValueProperty ).UpdateTarget();
+    }
+
 
 
 
@@ -252,6 +226,16 @@ internal object ComputeDescriptionForItem( object item )
               : pd.Description;
     }
 
+    internal object ComputeNewItemTypesForItem( object item )
+    {
+      PropertyDescriptor pd = item as PropertyDescriptor;
+      var attribute = PropertyGridUtilities.GetAttribute<NewItemTypesAttribute>( pd );
+
+      return ( attribute != null ) 
+              ? attribute.Types 
+              : null;
+    }
+
     internal object ComputeDisplayOrderForItem( object item )
     {
       PropertyDescriptor pd = item as PropertyDescriptor;
@@ -280,8 +264,8 @@ private void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventAr
 
     private string ComputeDisplayName()
     {
-      string displayName = GetPropertyDisplayName();
-      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( GetPropertyDescriptor() );
+      string displayName = PropertyDescriptor.DisplayName;
+      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
       if( ( attribute != null ) && attribute.NeedParenthesis )
       {
         displayName = "(" + displayName + ")";
@@ -290,17 +274,8 @@ private string ComputeDisplayName()
       return displayName;
     }
 
-     private FrameworkElement CreateCustomEditor( EditorDefinition customEditor )
-    {
-      return ( customEditor != null && customEditor.EditorTemplate != null )
-        ? customEditor.EditorTemplate.LoadContent() as FrameworkElement
-        : null;
-    }
-
     #endregion
 
-    #region IPropertyDefinition Properties
-
     #region AdvancedOptionsIcon (DP)
 
     public static readonly DependencyProperty AdvancedOptionsIconProperty =
@@ -355,19 +330,6 @@ public string CategoryValue
       }
     }
 
-    public IEnumerable<IPropertyDefinition> ChildrenDefinitions
-    {
-      get
-      {
-        if( _children == null )
-        {
-          _children = GenerateChildrenProperties();
-        }
-
-        return _children;
-      }
-    }
-
     public IEnumerable<CommandBinding> CommandBindings
     {
       get
@@ -383,7 +345,6 @@ public string DisplayName
         return _displayName;
       }
     }
-
     public string Description
     {
       get
@@ -408,11 +369,36 @@ public bool IsExpandable
       }
     }
 
-    public IPropertyParent PropertyParent
+    public bool IsReadOnly
     {
       get
       {
-        return _propertyParent;
+        return _isReadOnly;
+      }
+    }
+
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return _newItemTypes;
+      }
+    }
+
+    public string PropertyName
+    {
+      get
+      {
+        // A common property which is present in all selectedObjects will always have the same name.
+        return PropertyDescriptor.Name;
+      }
+    }
+
+    public Type PropertyType
+    {
+      get
+      {
+        return PropertyDescriptor.PropertyType;
       }
     }
 
@@ -446,90 +432,25 @@ private void OnValueChanged( object oldValue, object newValue )
 
     #endregion //Value Property
 
-    #endregion IPropertyDefinition Properties
-
-    #region IPropertyParent Properties
-
-    public object ValueInstance
-    {
-      get
-      {
-        return this.Value;
-      }
-    }
-
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return PropertyParent.EditorDefinitions;
-      }
-    }
-
-    #endregion
-
-    #region IPropertyDefinition Methods
-
-    public FrameworkElement GenerateEditorElement( PropertyItem propertyItem )
-    {
-      FrameworkElement editorElement = null;
-
-      // Priority #1: CustomEditors based on the Attribute.
-      ITypeEditor editor = GetAttributeEditor();
-      if( editor != null )
-        editorElement = editor.ResolveEditor( propertyItem );
-
-      if( _propertyParent.EditorDefinitions != null )
-      {
-        // Priority #2: Custom Editors based on the name (same for all PropertyDescriptors).
-        if( editorElement == null )
-          editorElement = CreateCustomEditor( _propertyParent.EditorDefinitions[ GetPropertyName() ] );
-
-        // Priority #3: Custom Editors based on the type (same for all PropertyDescriptors).
-        if( editorElement == null )
-          editorElement = CreateCustomEditor( _propertyParent.EditorDefinitions[ GetPropertyType() ] );
-      }
-
-      if( editorElement == null )
-      {
-        // Priority #4: Default Editor. Read-only properties use a TextBox.
-        if( IsPropertyDescriptorReadOnly() )
-          editor = new TextBlockEditor();
-
-        // Fallback: Use a default type editor.
-        if( editor == null )
-        {
-          editor = CreateDefaultEditor();
-        }
-
-        Debug.Assert( editor != null );
-
-        editorElement = editor.ResolveEditor( propertyItem );
-      }
-
-      return editorElement;
-    }
-
     public void InitProperties()
     {
+      // Do "IsReadOnly" and PropertyName first since the others may need that value.
+      _isReadOnly = ComputeIsReadOnly();
       _category = ComputeCategory();
       _categoryValue = ComputeCategoryValue();
       _description = ComputeDescription();
       _displayName = ComputeDisplayName();
       _displayOrder = ComputeDisplayOrder();
       _isExpandable = ComputeIsExpandable();
+      _newItemTypes = ComputeNewItemTypes();
       _commandBindings = new CommandBinding[] { new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) };
 
       UpdateAdvanceOptions();
 
-      SetBinding();
+      BindingBase valueBinding = this.CreateValueBinding();
+      BindingOperations.SetBinding( this, DescriptorPropertyDefinitionBase.ValueProperty, valueBinding );
     }
 
-    #endregion IPropertyDefinition Methods
-
-
-
-
     #region AdvancedOptionsValues struct (Internal )
 
     internal struct AdvancedOptionsValues
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
index 3d861ba59..862a309e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
@@ -1,33 +1,56 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class EditorDefinition
+  [Obsolete(@"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx)]
+  public class EditorDefinition : EditorTemplateDefinition
   {
+    private const string UsageEx = " (XAML Ex: <t:EditorTemplateDefinition TargetProperties=\"FirstName,LastName\" .../> OR <t:EditorTemplateDefinition TargetProperties=\"{x:Type l:MyType}\" .../> )";
+
+    public EditorDefinition()
+    {
+      const string usageErr = "{0} is obsolete. Instead use {1}.";
+      System.Diagnostics.Trace.TraceWarning( string.Format( usageErr, typeof( EditorDefinition ), typeof( EditorTemplateDefinition ) ) + UsageEx );
+    }
+
+    /// <summary>
+    /// Gets or sets the template of the editor.
+    /// This Property is part of the obsolete EditorDefinition class.
+    /// Use EditorTemplateDefinition class and the Edit<b>ing</b>Template property.
+    /// </summary>
     public DataTemplate EditorTemplate
     {
       get;
       set;
     }
 
+
     private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
+    /// <summary>
+    /// List the PropertyDefinitions that identify the properties targeted by the EditorTemplate.
+    /// This Property is part of the obsolete EditorDefinition class.
+    /// Use "EditorTemplateDefinition" class and the "TargetProperties" property<br/>
+    /// XAML Ex.: &lt;t:EditorTemplateDefinition TargetProperties="FirstName,LastName" .../&gt;
+    /// </summary>
     public PropertyDefinitionCollection PropertiesDefinitions
     {
       get
@@ -45,5 +68,33 @@ public Type TargetType
       get;
       set;
     }
+
+    internal override void Lock()
+    {
+      const string usageError = @"Use a EditorTemplateDefinition instead of EditorDefinition in order to use the '{0}' property.";
+      if( this.EditingTemplate != null )
+        throw new InvalidOperationException( string.Format( usageError, "EditingTemplate" ) );
+
+      if( this.TargetProperties != null && this.TargetProperties.Count > 0)
+        throw new InvalidOperationException( string.Format( usageError, "TargetProperties" ) );
+
+      List<object> properties = new List<object>();
+      if( this.PropertiesDefinitions != null )
+      {
+        foreach( PropertyDefinition def in this.PropertiesDefinitions )
+        {
+          if( def.TargetProperties != null )
+          {
+            properties.AddRange( def.TargetProperties.Cast<object>() );
+          }
+        }
+      }
+
+      this.TargetProperties = properties;
+      this.EditingTemplate = this.EditorTemplate;
+
+      base.Lock();
+    }
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs
deleted file mode 100644
index 83d061d83..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
-  {
-    public EditorDefinition this[ string propertyName ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.PropertiesDefinitions.Where( x => x.Name == propertyName ).Any() )
-            return item;
-        }
-
-        return null;
-      }
-    }
-
-    public EditorDefinition this[ Type targetType ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.TargetType == targetType )
-            return item;
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
index a5bbd5aed..ba4b4855a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
index e57651c51..70bafede4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <UserControl x:Class="Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
index b2a2dcc05..5e161a772 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
@@ -34,7 +34,7 @@ public CollectionEditor()
 
     private void Button_Click( object sender, RoutedEventArgs e )
     {
-      CollectionControlDialog editor = new CollectionControlDialog( _item.PropertyType );
+      CollectionControlDialog editor = new CollectionControlDialog( _item.PropertyType, _item.DescriptorDefinition.NewItemTypes );
       Binding binding = new Binding( "Value" );
       binding.Source = _item;
       binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
index bd5b8f95c..d3c6e68ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
@@ -22,6 +22,7 @@ protected override void SetControlProperties()
     {
       Editor.BorderThickness = new System.Windows.Thickness( 0 );
       Editor.DisplayColorAndName = true;
+      Editor.Style = PropertyGridUtilities.ColorPickerStyle;
     }
     protected override void SetValueDependencyProperty()
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
index 5a1b3a8d0..3e209caed 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -1,20 +1,21 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
+using System.Collections;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
@@ -25,13 +26,18 @@ protected override void SetValueDependencyProperty()
       ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
     }
 
+    protected override void SetControlProperties()
+    {
+      Editor.Style = PropertyGridUtilities.ComboBoxStyle;
+    }
+
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
       SetItemsSource( propertyItem );
       base.ResolveValueBinding( propertyItem );
     }
 
-    protected abstract IList<object> CreateItemsSource( PropertyItem propertyItem );
+    protected abstract IEnumerable CreateItemsSource( PropertyItem propertyItem );
 
     private void SetItemsSource( PropertyItem propertyItem )
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
index b545db2df..a607d4811 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -1,30 +1,31 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Collections;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class EnumComboBoxEditor : ComboBoxEditor
   {
-    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
     {
       return GetValues( propertyItem.PropertyType );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
index 48b43c062..ffefd4541 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -1,91 +1,42 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class FontComboBoxEditor : ComboBoxEditor
   {
-    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
     {
       if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return GetFontFamilies();
+        return FontUtilities.Families;
       else if( propertyItem.PropertyType == typeof( FontWeight ) )
-        return GetFontWeights();
+        return FontUtilities.Weights;
       else if( propertyItem.PropertyType == typeof( FontStyle ) )
-        return GetFontStyles();
+        return FontUtilities.Styles;
       else if( propertyItem.PropertyType == typeof( FontStretch ) )
-        return GetFontStretches();
+        return FontUtilities.Stretches;
 
       return null;
     }
-
-    private static IList<object> GetFontFamilies()
-    {
-#if !VS2008
-      return Fonts.SystemFontFamilies.ToList<object>();
-#else
-      return Fonts.SystemFontFamilies.Cast<object>().ToList();
-#endif
-    }
-
-    private static IList<object> GetFontWeights()
-    {
-      return new List<object>()
-            {
-                FontWeights.Black, 
-                FontWeights.Bold, 
-                FontWeights.ExtraBlack, 
-                FontWeights.ExtraBold,
-                FontWeights.ExtraLight, 
-                FontWeights.Light, 
-                FontWeights.Medium, 
-                FontWeights.Normal, 
-                FontWeights.SemiBold,
-                FontWeights.Thin
-            };
-    }
-
-    private static IList<object> GetFontStyles()
-    {
-      return new List<object>()
-            {
-                FontStyles.Italic,
-                FontStyles.Normal
-            };
-    }
-
-    private static IList<object> GetFontStretches()
-    {
-      return new List<object>()
-            {
-                FontStretches.Condensed,
-                FontStretches.Expanded,
-                FontStretches.ExtraCondensed,
-                FontStretches.ExtraExpanded,
-                FontStretches.Normal,
-                FontStretches.SemiCondensed,
-                FontStretches.SemiExpanded,
-                FontStretches.UltraCondensed,
-                FontStretches.UltraExpanded
-            };
-    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
index 29a7a4b19..bfeae6ab3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
index 5592885eb..10ef02066 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
@@ -43,6 +43,7 @@ protected override void SetControlProperties()
     {
       Editor.DisplayMemberPath = "DisplayName";
       Editor.SelectedValuePath = "Value";
+      Editor.Style = PropertyGridUtilities.ComboBoxStyle;
     }
 
     private void SetItemsSource()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
index c914f8647..da59a575f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index 611fc11a8..454b97c59 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
index 17cd92c0c..12a75235a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
@@ -22,7 +22,7 @@ public class TextBoxEditor : TypeEditor<WatermarkTextBox>
   {
     protected override void SetControlProperties()
     {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.Style = PropertyGridUtilities.NoBorderControlStyle;
     }
 
     protected override void SetValueDependencyProperty()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
index 4512437bb..623cfef8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
@@ -1,48 +1,37 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class TimeSpanEditor : DateTimeUpDownEditor
   {
-    private sealed class TimeSpanConverter : IValueConverter
-    {
-      object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return DateTime.Today + ( TimeSpan )value;
-      }
-
-      object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return ( ( DateTime )value ).TimeOfDay;
-      }
-    }
-
     protected override void SetControlProperties()
     {
+      base.SetControlProperties();
       Editor.Format = DateTimeFormat.LongTime;
     }
 
     protected override IValueConverter CreateValueConverter()
     {
-      return new TimeSpanConverter();
+      return new EditorTimeSpanConverter();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
index e711790d1..743c09a5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
index 4b4797211..82c39d2f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using Xceed.Wpf.Toolkit.Primitives;
 using System;
@@ -22,7 +22,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
   {
     protected override void SetControlProperties()
     {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.TextAlignment = System.Windows.TextAlignment.Left;
+      Editor.Style = PropertyGridUtilities.GetUpDownBaseStyle<TType>();
     }
     protected override void SetValueDependencyProperty()
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
new file mode 100644
index 000000000..86be8a120
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
@@ -0,0 +1,29 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal struct FilterInfo
+  {
+    public string InputString;
+    public Predicate<object> Predicate;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
new file mode 100644
index 000000000..d2aeada1f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
@@ -0,0 +1,47 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+using System.Collections.Generic;
+using System.Windows.Controls;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Data;
+using System;
+using System.Windows;
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal interface IPropertyContainer
+  {
+
+
+
+
+    ContainerHelperBase ContainerHelper { get; }
+
+    Style PropertyContainerStyle { get; }
+
+    EditorDefinitionCollection EditorDefinitions { get; }
+
+    PropertyDefinitionCollection PropertyDefinitions { get; }
+
+    bool IsCategorized { get; }
+
+    bool AutoGenerateProperties { get; }
+
+    FilterInfo FilterInfo { get; }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs
deleted file mode 100644
index 97beaf70e..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal interface IPropertyDefinition
-  {
-    ImageSource AdvancedOptionsIcon { get; }
-    object AdvancedOptionsTooltip { get; }
-    string Category { get; }
-    string CategoryValue { get; }
-    IEnumerable<IPropertyDefinition> ChildrenDefinitions { get; }
-    IEnumerable<CommandBinding> CommandBindings { get; }
-    string Description { get; }
-    string DisplayName { get; }
-    int DisplayOrder { get; }
-    bool IsExpandable { get; }
-    IPropertyParent PropertyParent { get; }
-    object Value { get; set; }
-
-    FrameworkElement GenerateEditorElement( PropertyItem propertyItem );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs
deleted file mode 100644
index 53148edcd..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-
-using System.Collections.Generic;
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal interface IPropertyParent
-  {
-    object ValueInstance { get; }
-
-    EditorDefinitionCollection EditorDefinitions { get; }
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
new file mode 100644
index 000000000..fcd3ad8d4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -0,0 +1,129 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class ObjectContainerHelper : ObjectContainerHelperBase
+  {
+    private object _selectedObject;
+
+    public ObjectContainerHelper( IPropertyContainer propertyContainer, object selectedObject )
+      : base( propertyContainer )
+    {
+      _selectedObject = selectedObject;
+    }
+
+    private object SelectedObject
+    {
+      get
+      {
+        return _selectedObject;
+      }
+    }
+
+    protected override string GetDefaultPropertyName()
+    {
+      object selectedObject = SelectedObject;
+      return ( selectedObject != null ) ? ObjectContainerHelperBase.GetDefaultPropertyName( SelectedObject ) : ( string )null;
+    }
+
+    protected override IEnumerable<PropertyItem> GenerateSubPropertiesCore()
+    {
+      var propertyItems = new List<PropertyItem>();
+
+      if( SelectedObject != null )
+      {
+        try
+        {
+          List<PropertyDescriptor> descriptors = ObjectContainerHelperBase.GetPropertyDescriptors( SelectedObject );
+          if( !PropertyContainer.AutoGenerateProperties )
+          {
+            List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
+            if( PropertyContainer.PropertyDefinitions != null )
+            {
+              foreach( PropertyDefinition pd in PropertyContainer.PropertyDefinitions )
+              {
+                foreach( object targetProperty in pd.TargetProperties )
+                {
+                  PropertyDescriptor descriptor = null;
+                  // If the target is a string, compare it with the property name.
+                  var propName = targetProperty as string;
+                  if( propName != null )
+                  {
+                    descriptor = descriptors.FirstOrDefault( d => d.Name == propName );
+                  }
+
+                  // If the target is a Type, compare it with the property type.
+                  var propType = targetProperty as Type;
+                  if( propType != null )
+                  {
+                    descriptor = descriptors.FirstOrDefault( d => d.PropertyType == propType );
+                  }
+
+                  if( descriptor != null )
+                  {
+                    specificProperties.Add( descriptor );
+                    descriptors.Remove( descriptor );
+                  }
+                }
+              }
+            }
+
+            descriptors = specificProperties;
+          }
+
+          foreach( PropertyDescriptor descriptor in descriptors )
+          {
+            if( descriptor.IsBrowsable )
+            {
+              propertyItems.Add( CreatePropertyItem( descriptor ) );
+            }
+          }
+        }
+        catch( Exception )
+        {
+          //TODO: handle this some how
+        }
+      }
+
+      return propertyItems;
+    }
+
+
+    private PropertyItem CreatePropertyItem( PropertyDescriptor property )
+    {
+      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject );
+      definition.InitProperties();
+      PropertyItem propertyItem = new PropertyItem( definition );
+      Debug.Assert( SelectedObject != null );
+      propertyItem.Instance = SelectedObject;
+      return propertyItem;
+    }
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
new file mode 100644
index 000000000..8418810ff
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -0,0 +1,390 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Windows.Controls.Primitives;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal abstract class ObjectContainerHelperBase : ContainerHelperBase
+  {
+    // This is needed to work around the ItemsControl behavior.
+    // When ItemsControl is preparing its containers, it appears 
+    // that calling Refresh() on the CollectionView bound to
+    // the ItemsSource prevents the items from being displayed.
+    // This patch is to avoid such a behavior.
+    private bool _isPreparingItemFlag = false;
+    private PropertyItemCollection _propertyItemCollection;
+
+    public ObjectContainerHelperBase( IPropertyContainer propertyContainer)
+      : base( propertyContainer )
+    {
+      _propertyItemCollection = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
+      UpdateFilter();
+      UpdateCategorization();
+
+    }
+
+    public override IList Properties
+    {
+      get { return _propertyItemCollection; }
+    }
+
+    private PropertyItem DefaultProperty
+    {
+      get 
+      {
+        PropertyItem defaultProperty = null;
+        var defaultName = this.GetDefaultPropertyName();
+        if( defaultName != null )
+        {
+          defaultProperty = _propertyItemCollection
+            .FirstOrDefault( ( prop ) => object.Equals( defaultName, prop.PropertyDescriptor.Name ) );
+        }
+
+        return defaultProperty;
+      }
+    }
+
+
+    protected PropertyItemCollection PropertyItems
+    {
+      get
+      {
+        return _propertyItemCollection;
+      }
+    }
+
+    public override PropertyItemBase ContainerFromItem( object item )
+    {
+      if( item == null )
+        return null;
+      // Exception case for ObjectContainerHelperBase. The "Item" may sometimes
+      // be identified as a string representing the property name or
+      // the PropertyItem itself.
+      Debug.Assert( item is PropertyItem || item is string );
+
+      var propertyItem = item as PropertyItem;
+      if( propertyItem != null )
+        return propertyItem;
+
+
+      var propertyStr = item as string;
+      if( propertyStr != null )
+        return PropertyItems.FirstOrDefault( ( prop ) => propertyStr == prop.PropertyDescriptor.Name );
+
+      return null;
+    }
+
+    public override object ItemFromContainer( PropertyItemBase container )
+    {
+      // Since this call is only used to update the PropertyGrid.SelectedProperty property,
+      // return the PropertyName.
+      var propertyItem = container as PropertyItem;
+      if( propertyItem == null )
+        return null;
+
+      return propertyItem.PropertyDescriptor.Name;
+    }
+
+    public override void  UpdateValuesFromSource()
+    {
+      foreach( PropertyItem item in PropertyItems )
+      {
+        item.DescriptorDefinition.UpdateValueFromSource();
+        item.ContainerHelper.UpdateValuesFromSource();
+      }
+    }
+
+    public void GenerateProperties()
+    {
+      if( PropertyItems.Count == 0 )
+      {
+        this.RegenerateProperties();
+      }
+    }
+
+    protected override void OnFilterChanged()
+    {
+      this.UpdateFilter();
+    }
+
+    protected override void OnCategorizationChanged()
+    {
+      UpdateCategorization();
+    }
+
+    protected override void OnAutoGeneratePropertiesChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    protected override void OnEditorDefinitionsChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    protected override void OnPropertyDefinitionsChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    private void UpdateFilter()
+    {
+      FilterInfo filterInfo = PropertyContainer.FilterInfo;
+
+      PropertyItems.FilterPredicate = filterInfo.Predicate
+        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString );
+    }
+
+    private void UpdateCategorization()
+    {
+      _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription() );
+    }
+
+    private GroupDescription ComputeCategoryGroupDescription()
+    {
+      if( !PropertyContainer.IsCategorized )
+        return null;
+      return new PropertyGroupDescription( PropertyItemCollection.CategoryPropertyName );
+    }
+
+    private string GetCategoryGroupingPropertyName()
+    {
+      var propGroup = this.ComputeCategoryGroupDescription() as PropertyGroupDescription;
+      return ( propGroup != null ) ? propGroup.PropertyName : null;
+    }
+
+    private void OnChildrenPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      if( ObjectContainerHelperBase.IsItemOrderingProperty( e.PropertyName )
+        || this.GetCategoryGroupingPropertyName() == e.PropertyName )
+      {
+        // Refreshing the view while Containers are generated will throw an exception
+        if( this.ChildrenItemsControl.ItemContainerGenerator.Status != GeneratorStatus.GeneratingContainers
+          && !_isPreparingItemFlag )
+        {
+          PropertyItems.RefreshView();
+        }
+      }
+    }
+
+    protected abstract string GetDefaultPropertyName();
+
+    protected abstract IEnumerable<PropertyItem> GenerateSubPropertiesCore();
+
+    private void RegenerateProperties()
+    {
+      IEnumerable<PropertyItem> subProperties = this.GenerateSubPropertiesCore();
+
+      var uiParent = PropertyContainer as UIElement;
+
+      foreach( var propertyItem in subProperties )
+      {
+        this.InitializePropertyItem( propertyItem );
+      }
+
+      //Remove the event callback from the previous children (if any)
+      foreach( var propertyItem in PropertyItems )
+      {
+        propertyItem.PropertyChanged -= OnChildrenPropertyChanged;
+      }
+
+
+      PropertyItems.UpdateItems( subProperties );
+
+      //Add the event callback to the new childrens
+      foreach( var propertyItem in PropertyItems )
+      {
+        propertyItem.PropertyChanged += OnChildrenPropertyChanged;
+      }
+
+      // Update the selected property on the property grid only.
+      PropertyGrid propertyGrid = PropertyContainer as PropertyGrid;
+      if( propertyGrid != null )
+      {
+        propertyGrid.SelectedPropertyItem = this.DefaultProperty;
+      }
+    }
+
+    protected static List<PropertyDescriptor> GetPropertyDescriptors( object instance )
+    {
+      PropertyDescriptorCollection descriptors;
+
+      TypeConverter tc = TypeDescriptor.GetConverter( instance );
+      if( tc == null || !tc.GetPropertiesSupported() )
+      {
+        if( instance is ICustomTypeDescriptor )
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
+        else
+          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
+      }
+      else
+      {
+        descriptors = tc.GetProperties( instance );
+      }
+
+      return ( descriptors != null )
+        ? descriptors.Cast<PropertyDescriptor>().ToList()
+        : null;
+    }
+
+    private void InitializePropertyItem( PropertyItem propertyItem )
+    {
+      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
+      propertyItem.PropertyDescriptor = pd.PropertyDescriptor;
+
+      propertyItem.IsReadOnly = pd.IsReadOnly;
+      propertyItem.DisplayName = pd.DisplayName;
+      propertyItem.Description = pd.Description;
+      propertyItem.Category = pd.Category;
+      propertyItem.PropertyOrder = pd.DisplayOrder;
+      propertyItem.IsExpandable = pd.IsExpandable;
+
+      //These properties can vary with the value. They need to be bound.
+      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsIconProperty, pd, () => pd.AdvancedOptionsIcon, BindingMode.OneWay );
+      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsTooltipProperty, pd, () => pd.AdvancedOptionsTooltip, BindingMode.OneWay );
+      SetupDefinitionBinding( propertyItem, PropertyItem.ValueProperty, pd, () => pd.Value, BindingMode.TwoWay );
+
+      if( pd.CommandBindings != null )
+      {
+        foreach( CommandBinding commandBinding in pd.CommandBindings )
+        {
+          propertyItem.CommandBindings.Add( commandBinding );
+        }
+      }
+    }
+
+    private void SetupDefinitionBinding<T>(
+      PropertyItem propertyItem,
+      DependencyProperty itemProperty,
+      DescriptorPropertyDefinitionBase pd,
+      Expression<Func<T>> definitionProperty,
+      BindingMode bindingMode )
+    {
+      string sourceProperty = ReflectionHelper.GetPropertyOrFieldName( definitionProperty );
+      Binding binding = new Binding( sourceProperty )
+      {
+        Source = pd,
+        Mode = bindingMode
+      };
+
+      propertyItem.SetBinding( itemProperty, binding );
+    }
+
+    private FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyItem )
+    {
+      FrameworkElement editorElement = null;
+      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
+      object definitionKey = null;
+      Type definitionKeyAsType = definitionKey as Type;
+
+      ITypeEditor editor = pd.CreateAttributeEditor();
+      if( editor != null )
+        editorElement = editor.ResolveEditor( propertyItem );
+
+
+      if( editorElement == null && definitionKey == null )
+        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyDescriptor.Name, propertyItem );
+
+      if( editorElement == null && definitionKeyAsType == null )
+        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyType, propertyItem );
+
+      if( editorElement == null )
+      {
+        if( pd.IsReadOnly )
+          editor = new TextBlockEditor();
+
+        // Fallback: Use a default type editor.
+        if( editor == null )
+        {
+          editor = ( definitionKeyAsType != null )
+          ? PropertyGridUtilities.CreateDefaultEditor( definitionKeyAsType, null )
+          : pd.CreateDefaultEditor();
+        }
+
+        Debug.Assert( editor != null );
+
+        editorElement = editor.ResolveEditor( propertyItem );
+      }
+
+      return editorElement;
+    }
+
+    public override void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+      _isPreparingItemFlag = true;
+      base.PrepareChildrenPropertyItem( propertyItem, item );
+
+      if( propertyItem.Editor == null )
+      {
+        FrameworkElement editor = this.GenerateChildrenEditorElement( ( PropertyItem )propertyItem );
+        if( editor != null )
+        {
+          // Tag the editor as generated to know if we should clear it.
+          ContainerHelperBase.SetIsGenerated( editor, true );
+          propertyItem.Editor = editor;
+        }
+      }
+      _isPreparingItemFlag = false;
+    }
+
+    public override void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+      if( propertyItem.Editor != null 
+        && ContainerHelperBase.GetIsGenerated( propertyItem.Editor ) )
+      {
+        propertyItem.Editor = null;
+      }
+
+      base.ClearChildrenPropertyItem( propertyItem, item );
+    }
+
+    public override Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem )
+    {
+      Binding binding = new Binding( "Value" );
+      binding.Mode = ( ( ( PropertyItem )propertyItem ).IsReadOnly ) ? BindingMode.OneWay : BindingMode.TwoWay;
+      return binding;
+    }
+
+    protected static string GetDefaultPropertyName( object instance )
+    {
+      AttributeCollection attributes = TypeDescriptor.GetAttributes( instance );
+      DefaultPropertyAttribute defaultPropertyAttribute = ( DefaultPropertyAttribute )attributes[ typeof( DefaultPropertyAttribute ) ];
+      return defaultPropertyAttribute != null ? defaultPropertyAttribute.Name : null;
+    }
+
+    private static bool IsItemOrderingProperty( string propertyName )
+    {
+      return string.Equals( propertyName, PropertyItemCollection.DisplayNamePropertyName )
+        || string.Equals( propertyName, PropertyItemCollection.CategoryOrderPropertyName )
+        || string.Equals( propertyName, PropertyItemCollection.PropertyOrderPropertyName );
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
index 2db8dfb1a..cc4aaaf13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -1,27 +1,56 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
+using System;
+using System.Collections.Generic;
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class PropertyDefinition
+  public class PropertyDefinition : PropertyDefinitionBase
   {
+    private string _name;
+
+    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
     public string Name
     {
-      get;
-      set;
+      get { return _name; }
+      set 
+      {
+        const string usageError = "{0}: \'Name\' property is obsolete. Instead use \'TargetProperties\'. (XAML example: <t:PropertyDefinition TargetProperties=\"FirstName,LastName\" />)";
+        System.Diagnostics.Trace.TraceWarning( usageError, typeof( PropertyDefinition ) );
+        _name = value; 
+      }
+    }
+
+    internal override void Lock()
+    {
+      if( _name != null
+        && this.TargetProperties != null
+        && this.TargetProperties.Count > 0 )
+      {
+        throw new InvalidOperationException(
+          string.Format(
+            @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", 
+            typeof( PropertyDefinition ) ) );
+      }
+
+      if( _name != null )
+      {
+        this.TargetProperties = new List<object>() { _name };
+      }
+      base.Lock();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
new file mode 100644
index 000000000..2b1a39623
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
@@ -0,0 +1,61 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinitionCollection : PropertyDefinitionBaseCollection<PropertyDefinition> { }
+  public class EditorDefinitionCollection : PropertyDefinitionBaseCollection<EditorDefinitionBase> { }
+
+  public abstract class PropertyDefinitionBaseCollection<T> : ObservableCollection<T> where T : PropertyDefinitionBase
+  {
+    internal PropertyDefinitionBaseCollection() { }
+
+    public T this[ object propertyId ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.TargetProperties.Contains( propertyId ) )
+            return item;
+        }
+
+        return null;
+      }
+    }
+
+    protected override void InsertItem( int index, T item )
+    {
+      if( item == null )
+        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
+
+      item.Lock();
+      base.InsertItem( index, item );
+    }
+
+    protected override void SetItem( int index, T item )
+    {
+      if( item == null )
+        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
+
+      item.Lock();
+      base.SetItem( index, item );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
deleted file mode 100644
index 182479781..000000000
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
-  {
-    public PropertyDefinition this[ string propertyName ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.Name == propertyName )
-            return item;
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index 21df3d4d1..8114be9b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -29,22 +29,32 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using System.Collections.ObjectModel;
 using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Reflection;
+using System.Linq.Expressions;
+using System.Windows.Markup;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
-  public class PropertyGrid : Control, ISupportInitialize, IPropertyParent
+  [TemplatePart( Name = PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
+  [StyleTypedProperty( Property = "PropertyContainerStyle", StyleTargetType = typeof( PropertyItemBase ) )]
+  public class PropertyGrid : Control, ISupportInitialize, IPropertyContainer, INotifyPropertyChanged
   {
     private const string PART_DragThumb = "PART_DragThumb";
+    internal const string PART_PropertyItemsControl = "PART_PropertyItemsControl";
+    private static readonly ComponentResourceKey SelectedObjectAdvancedOptionsMenuKey = new ComponentResourceKey( typeof( PropertyGrid ), "SelectedObjectAdvancedOptionsMenu" );
 
     #region Members
 
     private Thumb _dragThumb;
     private bool _hasPendingSelectedObjectChanged;
     private int _initializationCount;
-    private PropertyItemCollection _properties;
+    private ContainerHelperBase _containerHelper;
     private PropertyDefinitionCollection _propertyDefinitions;
     private EditorDefinitionCollection _editorDefinitions;
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _propertyDefinitionsListener;
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _editorDefinitionsListener;
 
     #endregion //Members
 
@@ -69,7 +79,7 @@ public ContextMenu AdvancedOptionsMenu
 
     #region AutoGenerateProperties
 
-    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnAutoGeneratePropertiesChanged ) );
+    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
     public bool AutoGenerateProperties
     {
       get
@@ -82,11 +92,6 @@ public bool AutoGenerateProperties
       }
     }
 
-    private static void OnAutoGeneratePropertiesChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( PropertyGrid )o ).UpdateProperties( true );
-    }
-
     #endregion //AutoGenerateProperties
 
     #region ShowSummary
@@ -116,26 +121,29 @@ public EditorDefinitionCollection EditorDefinitions
       }
       set
       {
-        EditorDefinitionCollection oldValue = _editorDefinitions;
-        _editorDefinitions = value;
-        this.OnEditorDefinitionsChanged( oldValue, value );
+        if( _editorDefinitions != value )
+        {
+          EditorDefinitionCollection oldValue = _editorDefinitions;
+          _editorDefinitions = value;
+          this.OnEditorDefinitionsChanged( oldValue, value );
+        }
       }
     }
 
     protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
     {
       if( oldValue != null )
-        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+        CollectionChangedEventManager.RemoveListener( oldValue, _editorDefinitionsListener );
 
       if( newValue != null )
-        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+        CollectionChangedEventManager.AddListener( newValue, _editorDefinitionsListener );
 
-      UpdateProperties( true );
+      this.Notify( this.PropertyChanged, () => this.EditorDefinitions );
     }
 
     private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      UpdateProperties( true );
+      _containerHelper.NotifyEditorDefinitionsCollectionChanged();
     }
 
     #endregion //EditorDefinitions
@@ -164,7 +172,9 @@ private static void OnFilterChanged( DependencyObject o, DependencyPropertyChang
 
     protected virtual void OnFilterChanged( string oldValue, string newValue )
     {
-      Properties.Filter( newValue );
+      // The Filter property affects the resulting FilterInfo of IPropertyContainer. Raise an event corresponding
+      // to this property.
+      this.Notify( this.PropertyChanged, () => ( ( IPropertyContainer )this ).FilterInfo );
     }
 
     #endregion //Filter
@@ -210,13 +220,30 @@ private static void OnIsCategorizedChanged( DependencyObject o, DependencyProper
 
     protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
     {
-      this.UpdateProperties( false );
       this.UpdateThumb();
-
     }
 
     #endregion //IsCategorized
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     #region NameColumnWidth
 
     public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
@@ -249,16 +276,53 @@ protected virtual void OnNameColumnWidthChanged( double oldValue, double newValu
 
     #region Properties
 
-    public PropertyItemCollection Properties
+    public IList Properties
     {
       get
       {
-        return _properties;
+        return _containerHelper.Properties;
       }
     }
 
     #endregion //Properties
 
+
+
+
+
+
+
+
+    #region PropertyContainerStyle
+
+    /// <summary>
+    /// Identifies the PropertyContainerStyle dependency property
+    /// </summary>
+    public static readonly DependencyProperty PropertyContainerStyleProperty =
+        DependencyProperty.Register( "PropertyContainerStyle", typeof( Style ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnPropertyContainerStyleChanged ) );
+
+    /// <summary>
+    /// Gets or sets the style that will be applied to all PropertyItemBase instances displayed in the property grid.
+    /// </summary>
+    public Style PropertyContainerStyle
+    {
+      get { return ( Style )GetValue( PropertyContainerStyleProperty ); }
+      set { SetValue( PropertyContainerStyleProperty, value ); }
+    }
+
+    private static void OnPropertyContainerStyleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var owner = o as PropertyGrid;
+      if( owner != null )
+        owner.OnPropertyContainerStyleChanged( ( Style )e.OldValue, ( Style )e.NewValue );
+    }
+
+    protected virtual void OnPropertyContainerStyleChanged( Style oldValue, Style newValue )
+    {
+    }
+
+    #endregion //PropertyContainerStyle
+
     #region PropertyDefinitions
 
     public PropertyDefinitionCollection PropertyDefinitions
@@ -269,26 +333,29 @@ public PropertyDefinitionCollection PropertyDefinitions
       }
       set
       {
-        PropertyDefinitionCollection oldValue = _propertyDefinitions;
-        _propertyDefinitions = value;
-        this.OnPropertyDefinitionsChanged( oldValue, value );
+        if( _propertyDefinitions != value )
+        {
+          PropertyDefinitionCollection oldValue = _propertyDefinitions;
+          _propertyDefinitions = value;
+          this.OnPropertyDefinitionsChanged( oldValue, value );
+        }
       }
     }
 
     protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
     {
       if( oldValue != null )
-        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+        CollectionChangedEventManager.RemoveListener( oldValue, _propertyDefinitionsListener );
 
       if( newValue != null )
-        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+        CollectionChangedEventManager.AddListener( newValue, _propertyDefinitionsListener );
 
-      UpdateProperties( true );
+      this.Notify( this.PropertyChanged, () => this.PropertyDefinitions );
     }
 
     private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      UpdateProperties( true );
+      _containerHelper.NotifyPropertyDefinitionsCollectionChanged();
     }
 
     #endregion //PropertyDefinitions
@@ -341,7 +408,7 @@ protected virtual void OnSelectedObjectChanged( object oldValue, object newValue
         return;
       }
 
-      this.UpdateProperties( true );
+      this.UpdateContainerHelper();
 
       RaiseEvent( new RoutedPropertyChangedEventArgs<object>( oldValue, newValue, PropertyGrid.SelectedObjectChangedEvent ) );
     }
@@ -445,16 +512,17 @@ protected virtual void SelectedObjectNameChanged( string oldValue, string newVal
 
     #region SelectedPropertyItem
 
-    public static readonly DependencyProperty SelectedPropertyItemProperty = DependencyProperty.Register( "SelectedPropertyItem", typeof( PropertyItem ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
-    public PropertyItem SelectedPropertyItem
+    private static readonly DependencyPropertyKey SelectedPropertyItemPropertyKey = DependencyProperty.RegisterReadOnly( "SelectedPropertyItem", typeof( PropertyItemBase ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
+    public static readonly DependencyProperty SelectedPropertyItemProperty = SelectedPropertyItemPropertyKey.DependencyProperty;
+    public PropertyItemBase SelectedPropertyItem
     {
       get
       {
-        return ( PropertyItem )GetValue( SelectedPropertyItemProperty );
+        return ( PropertyItemBase )GetValue( SelectedPropertyItemProperty );
       }
       internal set
       {
-        SetValue( SelectedPropertyItemProperty, value );
+        SetValue( SelectedPropertyItemPropertyKey, value );
       }
     }
 
@@ -462,10 +530,10 @@ private static void OnSelectedPropertyItemChanged( DependencyObject o, Dependenc
     {
       PropertyGrid propertyGrid = o as PropertyGrid;
       if( propertyGrid != null )
-        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItem )e.OldValue, ( PropertyItem )e.NewValue );
+        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItemBase )e.OldValue, ( PropertyItemBase )e.NewValue );
     }
 
-    protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, PropertyItem newValue )
+    protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, PropertyItemBase newValue )
     {
       if( oldValue != null )
         oldValue.IsSelected = false;
@@ -473,11 +541,53 @@ protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, Pro
       if( newValue != null )
         newValue.IsSelected = true;
 
-      RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItem>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
+      this.SelectedProperty = ( newValue != null ) ? _containerHelper.ItemFromContainer( newValue ) : null;
+
+      RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItemBase>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
     }
 
     #endregion //SelectedPropertyItem
 
+    #region SelectedProperty
+
+    /// <summary>
+    /// Identifies the SelectedProperty dependency property
+    /// </summary>
+    public static readonly DependencyProperty SelectedPropertyProperty =
+        DependencyProperty.Register( "SelectedProperty", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyChanged ) );
+
+    /// <summary>
+    /// Gets or sets the selected property or returns null if the selection is empty.
+    /// </summary>
+    public object SelectedProperty
+    {
+      get { return ( object )GetValue( SelectedPropertyProperty ); }
+      set { SetValue( SelectedPropertyProperty, value ); }
+    }
+
+    private static void OnSelectedPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
+    {
+      PropertyGrid propertyGrid = sender as PropertyGrid;
+      if( propertyGrid != null )
+      {
+        propertyGrid.OnSelectedPropertyChanged( ( object )args.OldValue, ( object )args.NewValue );
+      }
+    }
+
+    private void OnSelectedPropertyChanged( object oldValue, object newValue )
+    {
+      // Do not update the SelectedPropertyItem if the Current SelectedPropertyItem
+      // item is the same as the new SelectedProperty. There may be 
+      // duplicate items and the result could be to change the selection to the wrong item.
+      object currentSelectedProperty = _containerHelper.ItemFromContainer( this.SelectedPropertyItem );
+      if( !object.Equals( currentSelectedProperty, newValue ) )
+      {
+        this.SelectedPropertyItem = _containerHelper.ContainerFromItem( newValue );
+      }
+    }
+
+    #endregion //SelectedProperty
+
     #region ShowAdvancedOptions
 
     public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
@@ -557,12 +667,15 @@ static PropertyGrid()
 
     public PropertyGrid()
     {
-      _properties = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
+      _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
+      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);
+      UpdateContainerHelper();
       EditorDefinitions = new EditorDefinitionCollection();
       PropertyDefinitions = new PropertyDefinitionCollection();
 
-      AddHandler( PropertyItem.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
-      AddHandler( PropertyItem.ItemOrderingChangedEvent, new RoutedEventHandler( OnItemOrderingChanged ) );
+      AddHandler( PropertyItemBase.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
+      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
+      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
       CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
     }
 
@@ -581,6 +694,8 @@ public override void OnApplyTemplate()
       if( _dragThumb != null )
         _dragThumb.DragDelta += DragThumb_DragDelta;
 
+      _containerHelper.ChildrenItemsControl = GetTemplateChild( PART_PropertyItemsControl ) as PropertyItemsControl;
+
       //Update TranslateTransform in code-behind instead of XAML to remove the
       //output window error.
       //When we use FindAncesstor in custom control template for binding internal elements property 
@@ -609,13 +724,25 @@ protected override void OnPreviewKeyDown( KeyEventArgs e )
       }
     }
 
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+
+      // First check that the raised property is actually a real CLR property.
+      // This could be something else like a Attached DP.
+      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) )
+      {
+        this.Notify( this.PropertyChanged, e.Property.Name );
+      }
+    }
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
 
     private void OnItemSelectionChanged( object sender, RoutedEventArgs args )
     {
-      PropertyItem item = ( PropertyItem )args.OriginalSource;
+      PropertyItemBase item = ( PropertyItemBase )args.OriginalSource;
       if( item.IsSelected )
       {
         SelectedPropertyItem = item;
@@ -629,9 +756,15 @@ private void OnItemSelectionChanged( object sender, RoutedEventArgs args )
       }
     }
 
-    private void OnItemOrderingChanged( object sender, RoutedEventArgs args )
+    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
     {
-      Properties.RefreshView();
+      _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
+      args.Handled = true;
+    }
+
+    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
       args.Handled = true;
     }
 
@@ -658,95 +791,41 @@ private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
 
     #region Methods
 
-    private void UpdateProperties( bool regenerateItems )
-    {
-      IEnumerable<PropertyItem> newProperties = null;
-      string defaultPropertyName = null;
-
-      if( regenerateItems )
-      {
-        newProperties = GeneratePropertyItems();
-        defaultPropertyName = GetDefaultPropertyName();
-
-        this.SelectedPropertyItem = ( defaultPropertyName != null )
-                                    ? newProperties.FirstOrDefault( ( prop ) => defaultPropertyName.Equals( prop.PropertyName ) )
-                                    : null;
-    }
-
-      Properties.Update( newProperties, IsCategorized, Filter );
-    }
-
-    private List<PropertyItem> GeneratePropertyItems()
-    {
-        return GeneratePropertyItems( SelectedObject );
-    }
-
-    private string GetDefaultPropertyName()
+    private void UpdateContainerHelper()
     {
-        return GetDefaultPropertyName( SelectedObject );
-    }
-
-    private List<PropertyItem> GeneratePropertyItems(object instance)
-    {
-      var propertyItems = new List<PropertyItem>();
-
-      if( instance != null )
+      // Keep a backup of the template element and initialize the
+      // new helper with it.
+      ItemsControl childrenItemsControl = null;
+      if( _containerHelper != null )
       {
-        try
+        childrenItemsControl = _containerHelper.ChildrenItemsControl;
+        _containerHelper.ClearHelper();
+        if( _containerHelper is ObjectContainerHelperBase )
         {
-          PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( instance );
-
-          if( !AutoGenerateProperties )
+          // If the actual AdvancedOptionMenu is the default menu for selected object, 
+          // remove it. Otherwise, it is a custom menu provided by the user.
+          // This "default" menu is only valid for the SelectedObject[s] case. Otherwise, 
+          // it is useless and we must remove it.
+          var defaultAdvancedMenu = ( ContextMenu )this.FindResource( PropertyGrid.SelectedObjectAdvancedOptionsMenuKey );
+          if( this.AdvancedOptionsMenu == defaultAdvancedMenu )
           {
-            List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
-            if( PropertyDefinitions != null )
-            {
-              foreach( PropertyDefinition pd in PropertyDefinitions )
-              {
-                foreach( PropertyDescriptor descriptor in descriptors )
-                {
-                  if( descriptor.Name == pd.Name )
-                  {
-                    specificProperties.Add( descriptor );
-                    break;
-                  }
-                }
-              }
-            }
-
-            descriptors = new PropertyDescriptorCollection( specificProperties.ToArray() );
-          }
-
-          foreach( PropertyDescriptor descriptor in descriptors )
-          {
-            if( descriptor.IsBrowsable )
-            {
-              propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, this ) );
-            }
+            this.AdvancedOptionsMenu = null;
           }
         }
-        catch( Exception )
-        {
-          //TODO: handle this some how
-        }
       }
 
-      return propertyItems;
-    }
-
-    private string GetDefaultPropertyName( object selectedObject )
-    {
-      return PropertyGridUtilities.GetDefaultPropertyName( selectedObject );
-    }
-
-
-
-
 
 
 
+      _containerHelper = new ObjectContainerHelper( this, SelectedObject );
+      ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
 
 
+      _containerHelper.ChildrenItemsControl = childrenItemsControl;
+      // Since the template will bind on this property and this property
+      // will be different when the property parent is updated.
+      this.Notify( this.PropertyChanged, () => this.Properties );
+    }
 
 
 
@@ -763,28 +842,45 @@ private void UpdateThumb()
     {
       if( _dragThumb != null )
       {
-        if( IsCategorized )
-          _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
-        else
-          _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+      if( IsCategorized )
+        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+      else
+        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
       }
     }
 
+    /// <summary>
+    /// Override this call to control the filter applied based on the
+    /// text input.
+    /// </summary>
+    /// <param name="filter"></param>
+    /// <returns></returns>
+    protected virtual Predicate<object> CreateFilter( string filter )
+    {
+      return null;
+    }
+
     /// <summary>
     /// Updates all property values in the PropertyGrid with the data from the SelectedObject
     /// </summary>
     public void Update()
     {
-      foreach( var item in Properties )
-      {
-        BindingOperations.GetBindingExpressionBase( item, PropertyItem.ValueProperty ).UpdateTarget();
-      }
+      _containerHelper.UpdateValuesFromSource();
     }
 
+
+
     #endregion //Methods
 
     #region Events
 
+    #region PropertyChanged Event
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    #endregion
+
+    #region PropertyValueChangedEvent Routed Event
     public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
     public event PropertyValueChangedEventHandler PropertyValueChanged
     {
@@ -797,9 +893,12 @@ public event PropertyValueChangedEventHandler PropertyValueChanged
         RemoveHandler( PropertyValueChangedEvent, value );
       }
     }
+    #endregion
+
+    #region SelectedPropertyItemChangedEvent Routed Event
 
-    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItem> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<PropertyItem> SelectedPropertyItemChanged
+    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItemBase> ), typeof( PropertyGrid ) );
+    public event RoutedPropertyChangedEventHandler<PropertyItemBase> SelectedPropertyItemChanged
     {
       add
       {
@@ -810,6 +909,9 @@ public event RoutedPropertyChangedEventHandler<PropertyItem> SelectedPropertyIte
         RemoveHandler( SelectedPropertyItemChangedEvent, value );
       }
     }
+    #endregion
+
+    #region SelectedObjectChangedEventRouted Routed Event
 
     public static readonly RoutedEvent SelectedObjectChangedEvent = EventManager.RegisterRoutedEvent( "SelectedObjectChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( PropertyGrid ) );
     public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
@@ -824,6 +926,111 @@ public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
       }
     }
 
+    #endregion
+
+    #region PreparePropertyItemEvent Attached Routed Event
+
+    /// <summary>
+    /// Identifies the PreparePropertyItem event.
+    /// This attached routed event may be raised by the PropertyGrid itself or by a
+    /// PropertyItemBase containing sub-items.
+    /// </summary>
+    public static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
+
+    /// <summary>
+    /// This event is raised when a property item is about to be displayed in the PropertyGrid.
+    /// This allow the user to customize the property item just before it is displayed.
+    /// </summary>
+    public event PropertyItemEventHandler PreparePropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyGrid.PreparePropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyGrid.PreparePropertyItemEvent, value );
+      }
+    }
+
+    /// <summary>
+    /// Adds a handler for the PreparePropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void AddPreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.AddHandler( PropertyGrid.PreparePropertyItemEvent, handler );
+    }
+
+    /// <summary>
+    /// Removes a handler for the PreparePropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void RemovePreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.RemoveHandler( PropertyGrid.PreparePropertyItemEvent, handler );
+    }
+
+    internal static void RaisePreparePropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
+    {
+      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.PreparePropertyItemEvent, source, propertyItem, item ) );
+    }
+
+    #endregion
+
+    #region ClearPropertyItemEvent Attached Routed Event
+
+    /// <summary>
+    /// Identifies the ClearPropertyItem event.
+    /// This attached routed event may be raised by the PropertyGrid itself or by a
+    /// PropertyItemBase containing sub items.
+    /// </summary>
+    public static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
+    /// <summary>
+    /// This event is raised when an property item is about to be remove from the display in the PropertyGrid
+    /// This allow the user to remove any attached handler in the PreparePropertyItem event.
+    /// </summary>
+    public event PropertyItemEventHandler ClearPropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyGrid.ClearPropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyGrid.ClearPropertyItemEvent, value );
+      }
+    }
+
+    /// <summary>
+    /// Adds a handler for the ClearPropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void AddClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.AddHandler( PropertyGrid.ClearPropertyItemEvent, handler );
+    }
+
+    /// <summary>
+    /// Removes a handler for the ClearPropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void RemoveClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.RemoveHandler( PropertyGrid.ClearPropertyItemEvent, handler );
+    }
+
+    internal static void RaiseClearPropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
+    {
+      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.ClearPropertyItemEvent, source, propertyItem, item ) );
+    }
+
+    #endregion
+
     #endregion //Events
 
     #region Interfaces
@@ -841,44 +1048,48 @@ public override void EndInit()
       base.EndInit();
       if( --_initializationCount == 0 )
       {
-        ProcessInitializationParameters();
-      }
-    }
-
-    private void ProcessInitializationParameters()
-    {
-      if( _hasPendingSelectedObjectChanged )
-      {
-        //This will update SelectedObject, Type, Name based on the actual config.
-        this.UpdateProperties( true );
-        _hasPendingSelectedObjectChanged = false;
+        if( _hasPendingSelectedObjectChanged )
+        {
+          //This will update SelectedObject, Type, Name based on the actual config.
+          this.UpdateContainerHelper();
+          _hasPendingSelectedObjectChanged = false;
+        }
+        _containerHelper.OnEndInit();
       }
     }
 
     #endregion
 
-    #region IPropertyParent Members
+    #region IPropertyContainer Members
 
-    object IPropertyParent.ValueInstance
+    FilterInfo IPropertyContainer.FilterInfo
     {
-      get { return this.SelectedObject; }
+      get 
+      {
+        return new FilterInfo()
+        {
+          Predicate = this.CreateFilter(this.Filter),
+          InputString = this.Filter
+        };
+      }
     }
 
-    EditorDefinitionCollection IPropertyParent.EditorDefinitions
+    ContainerHelperBase IPropertyContainer.ContainerHelper
     {
-      get { return this.EditorDefinitions; }
+      get
+      {
+        return _containerHelper;
+      }
     }
 
-
     #endregion
 
 
-
-
-
     #endregion
+
   }
 
+  #region PropertyValueChangedEvent Handler/Args
   public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
   public class PropertyValueChangedEventArgs : RoutedEventArgs
   {
@@ -900,4 +1111,31 @@ public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, ob
       OldValue = oldValue;
     }
   }
+  #endregion
+
+  #region PropertyItemCreatedEvent Handler/Args
+  public delegate void PropertyItemEventHandler( object sender, PropertyItemEventArgs e );
+  public class PropertyItemEventArgs : RoutedEventArgs
+  {
+    public PropertyItemBase PropertyItem
+    {
+      get;
+      private set;
+    }
+
+    public object Item
+    {
+      get;
+      private set;
+    }
+
+    public PropertyItemEventArgs( RoutedEvent routedEvent, object source, PropertyItemBase propertyItem, object item )
+      : base( routedEvent, source )
+    {
+      this.PropertyItem = propertyItem;
+      this.Item = item;
+    }
+  }
+  #endregion
+
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
index 44cc924b1..caada6c45 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -27,136 +27,132 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Linq.Expressions;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
 using System.Windows.Controls;
+using System.Reflection;
+using System.Windows.Controls.Primitives;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
+using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   internal class PropertyGridUtilities
   {
-    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
+    #region DefaultNoBorderControlStyle Static Property
+    private static Style _noBorderControlStyle;
+    internal static Style NoBorderControlStyle
     {
-      return property.Attributes.OfType<T>().FirstOrDefault();
-    }
-
-
-
-
-
-
-
-
+      get
+      {
+        if( _noBorderControlStyle == null )
+        {
+          var style = new Style( typeof( Control ) );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add(
+            new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          style.Triggers.Add( trigger );
+
+          _noBorderControlStyle = style;
+        }
 
-    internal static string GetDefaultPropertyName( object instance )
-    {
-      AttributeCollection attributes = TypeDescriptor.GetAttributes( instance );
-      DefaultPropertyAttribute defaultPropertyAttribute =( DefaultPropertyAttribute )attributes[ typeof( DefaultPropertyAttribute ) ];
-      return defaultPropertyAttribute != null ? defaultPropertyAttribute.Name : null;
+        return _noBorderControlStyle;
+      }
     }
+    #endregion
 
-    internal static PropertyDescriptorCollection GetPropertyDescriptors( object instance )
+    #region PropertyGridComboBoxStyle Static Property
+    private static Style _propertyGridComboBoxStyle;
+    internal static Style ComboBoxStyle
     {
-      PropertyDescriptorCollection descriptors;
-
-      TypeConverter tc = TypeDescriptor.GetConverter( instance );
-      if( tc == null || !tc.GetPropertiesSupported() )
+      get
       {
-        if( instance is ICustomTypeDescriptor )
-          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
-        else
-          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
-      }
-      else
-      {
-        descriptors = tc.GetProperties( instance );
+        if( _propertyGridComboBoxStyle == null )
+        {
+          var style = new Style( typeof( Control ) );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( Control.BackgroundProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          style.Triggers.Add( trigger );
+
+          _propertyGridComboBoxStyle = style;
+        }
+        return _propertyGridComboBoxStyle;
       }
-
-      return descriptors;
     }
+    #endregion
 
-
-
-
-
-
-
-
-
-    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, IPropertyParent propertyParent )
+    #region ColorPickerStyle Static Property
+    private static Style _colorPickerStyle;
+    internal static Style ColorPickerStyle
     {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, propertyParent );
-      definition.InitProperties();
-      PropertyItem propertyItem = new PropertyItem();
-      propertyItem.PropertyDescriptor = property;
-      propertyItem.Instance = propertyParent.ValueInstance;
-      PropertyGridUtilities.InitializePropertyItem( propertyItem, definition );
-      return propertyItem;
-    }
-
-    internal static PropertyItem CreatePropertyItem( IPropertyDefinition pd )
-    {
-      PropertyItem propertyItem = new PropertyItem();
+      get
+      {
+        if( _colorPickerStyle == null )
+        {
+          Style defaultColorPickerStyle = Application.Current.TryFindResource( typeof( ColorPicker ) ) as Style;
+          var style = new Style( typeof( ColorPicker ), defaultColorPickerStyle );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( ColorPicker.ShowDropDownButtonProperty, false ) );
+          style.Triggers.Add( trigger );
+
+          _colorPickerStyle = style;
+        }
 
-      var descriptorBase = pd as DescriptorPropertyDefinitionBase;
-      propertyItem.PropertyDescriptor = ( descriptorBase != null ) ? descriptorBase.GetPropertyDescriptor() : null;
-      propertyItem.Instance = ( descriptorBase != null ) ? descriptorBase.PropertyParent.ValueInstance : null;
-      PropertyGridUtilities.InitializePropertyItem( propertyItem, pd );
-      return propertyItem;
+        return _colorPickerStyle;
+      }
     }
+    #endregion
 
-    private static void InitializePropertyItem( PropertyItem propertyItem, IPropertyDefinition pd )
+    #region UpDownBaseStyle Static Getter
+    private static Dictionary<Type, Style> _upDownStyles;
+    internal static Style GetUpDownBaseStyle<T>()
     {
-      propertyItem.ChildrenDefinitions = pd.ChildrenDefinitions;
-
-
-      // Assign a shorter name, for code clarity only.
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.DisplayNameProperty, pd, () => pd.DisplayName );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.DescriptionProperty, pd, () => pd.Description );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.CategoryProperty, pd, () => pd.Category );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.PropertyOrderProperty, pd, () => pd.DisplayOrder );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.AdvancedOptionsIconProperty, pd, () => pd.AdvancedOptionsIcon );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.AdvancedOptionsTooltipProperty, pd, () => pd.AdvancedOptionsTooltip );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.IsExpandableProperty, pd, () => pd.IsExpandable );
-
-      Binding valueBinding = new Binding( "Value" )
+      if( _upDownStyles == null )
       {
-        Source = pd,
-        Mode = BindingMode.TwoWay
-      };
-      propertyItem.SetBinding( PropertyItem.ValueProperty, valueBinding );
-
-      propertyItem.Editor = pd.GenerateEditorElement( propertyItem );
+        _upDownStyles = new Dictionary<Type, Style>();
+      }
 
-      if( pd.CommandBindings != null )
+      Style style;
+      if( !_upDownStyles.TryGetValue( typeof( T ), out style ) )
       {
-        foreach( CommandBinding commandBinding in pd.CommandBindings )
-        {
-          propertyItem.CommandBindings.Add( commandBinding );
-        }
+        style = new Style( typeof( UpDownBase<T> ) );
+        var trigger = new MultiTrigger();
+        trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+        trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+        trigger.Setters.Add(
+          new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+        trigger.Setters.Add(
+          new Setter( UpDownBase<T>.ShowButtonSpinnerProperty, false ) );
+        style.Triggers.Add( trigger );
+
+        _upDownStyles.Add( typeof( T ), style );
       }
+      return style;
     }
+    #endregion
 
-    private static void SetupDefinitionBinding<T>( 
-      PropertyItem propertyItem, 
-      DependencyProperty itemProperty, 
-      IPropertyDefinition pd,
-      Expression<Func<T>> definitionProperty )
+    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
     {
-      string sourceProperty = ReflectionHelper.GetPropertyOrFieldName( definitionProperty );
-      Binding binding = new Binding( sourceProperty )
-      {
-        Source = pd,
-        Mode = BindingMode.OneWay
-      };
-
-      propertyItem.SetBinding( itemProperty, binding );
+      return property.Attributes.OfType<T>().FirstOrDefault();
     }
 
+
+
+
     internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverter typeConverter )
     {
       ITypeEditor editor = null;
 
-      if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
+      if( propertyType == typeof( string )  )
+        editor = new TextBoxEditor();
+      else if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
         editor = new CheckBoxEditor();
       else if( propertyType == typeof( decimal ) || propertyType == typeof( decimal? ) )
         editor = new DecimalUpDownEditor();
@@ -197,7 +193,7 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte
         editor = new TextBoxEditor();
       else
       {
-        Type listType = CollectionControl.GetListItemType( propertyType );
+        Type listType = ListUtilities.GetListItemType( propertyType );
 
         if( listType != null )
         {
@@ -219,5 +215,18 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte
 
       return editor;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
index 6d2256d86..4d9979891 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -24,258 +24,69 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Linq.Expressions;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class PropertyItem : Control
+  [TemplatePart( Name = "content", Type = typeof( ContentControl ) )]
+  public class PropertyItem : CustomPropertyItem
   {
-    #region Properties
-
-    #region AdvancedOptionsIcon
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
-      set { SetValue( AdvancedOptionsIconProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsIcon
-
-    #region AdvancedOptionsTooltip
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
-      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-    #region Category
+    private int _categoryOrder;
 
-    public static readonly DependencyProperty CategoryProperty =
-        DependencyProperty.Register( "Category", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string Category
-    {
-      get { return ( string )GetValue( CategoryProperty ); }
-      set { SetValue( CategoryProperty, value ); }
-    }
-
-    #endregion //Category
+    #region Properties
 
     #region CategoryOrder
 
     public int CategoryOrder
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //CategoryOrder
-
-    #region ChildrenDefinitions
-
-    internal IEnumerable<IPropertyDefinition> ChildrenDefinitions
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Description
-
-    public static readonly DependencyProperty DescriptionProperty =
-        DependencyProperty.Register( "Description", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string Description
-    {
-      get { return ( string )GetValue( DescriptionProperty ); }
-      set { SetValue( DescriptionProperty, value ); }
-    }
-
-    #endregion //Description
-
-    #region DisplayName
-
-    public static readonly DependencyProperty DisplayNameProperty =
-        DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string DisplayName
-    {
-      get { return ( string )GetValue( DisplayNameProperty ); }
-      set { SetValue( DisplayNameProperty, value ); }
-    }
-
-    #endregion //DisplayName
-
-    #region Editor
-
-    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnEditorChanged ) );
-    public FrameworkElement Editor
-    {
-      get
-      {
-        return ( FrameworkElement )GetValue( EditorProperty );
-      }
-      set
-      {
-        SetValue( EditorProperty, value );
-      }
-    }
-
-    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
-    }
-
-    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-      if( oldValue != null )
-        oldValue.DataContext = null;
-
-      if( newValue != null )
-        newValue.DataContext = this;
-    }
-
-    #endregion //Editor
-
-    #region Instance
-
-    public object Instance
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Instance
-
-    #region IsExpanded
-
-    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
-    public bool IsExpanded
     {
       get
       {
-        return ( bool )GetValue( IsExpandedProperty );
+        return _categoryOrder;
       }
-      set
+      internal set
       {
-        SetValue( IsExpandedProperty, value );
-      }
-    }
-
-    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && Properties.Count == 0 && ( this.ChildrenDefinitions != null ) )
-      {
-        IEnumerable<PropertyItem> children = this.ChildrenDefinitions
-          .Select( 
-          ( def ) => 
-            {
-              PropertyItem subProperty = PropertyGridUtilities.CreatePropertyItem( def );
-              subProperty.Level = Level + 1;
-              return subProperty;
-            });
-
-        Properties.Update( children, false, null );
+        if( _categoryOrder != value )
+        {
+          _categoryOrder = value;
+          // Notify the parent helper since this property may affect ordering.
+          this.RaisePropertyChanged( () => this.CategoryOrder );
+        }
       }
     }
 
-    #endregion IsExpanded
-
-    #region IsExpandable
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get { return ( bool )GetValue( IsExpandableProperty ); }
-      set { SetValue( IsExpandableProperty, value ); }
-    }
-
-    #endregion //IsExpandable
+    #endregion //CategoryOrder
 
     #region IsReadOnly
 
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( PropertyDescriptor != null )
-        ? PropertyDescriptor.IsReadOnly
-        : false;
-      }
-    }
-
-    #endregion
-
-    #region IsSelected
+    /// <summary>
+    /// Identifies the IsReadOnly dependency property
+    /// </summary>
+    public static readonly DependencyProperty IsReadOnlyProperty =
+        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
-    public bool IsSelected
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectedProperty );
-      }
-      set
-      {
-        SetValue( IsSelectedProperty, value );
-      }
-    }
-
-    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    public bool IsReadOnly
     {
-      this.RaiseItemSelectionChangedEvent();
+      get { return ( bool )GetValue( IsReadOnlyProperty ); }
+      set { SetValue( IsReadOnlyProperty, value ); }
     }
 
-    #endregion //IsSelected
-
-    #region Level
+    #endregion //IsReadOnly
 
-    public int Level
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Level
+    #region PropertyOrder
 
-    #region Properties
+    public static readonly DependencyProperty PropertyOrderProperty =
+        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
 
-    public PropertyItemCollection Properties
+    public int PropertyOrder
     {
-      get;
-      private set;
+      get { return ( int )GetValue( PropertyOrderProperty ); }
+      set { SetValue( PropertyOrderProperty, value ); }
     }
 
-    #endregion //Properties
+    #endregion //PropertyOrder
 
     #region PropertyDescriptor
 
@@ -287,71 +98,68 @@ public PropertyDescriptor PropertyDescriptor
 
     #endregion //PropertyDescriptor
 
-    #region PropertyName
+    #region PropertyType
 
-    internal string PropertyName
+    public Type PropertyType
     {
       get
       {
-        PropertyDescriptor descriptor = this.PropertyDescriptor;
-        return ( descriptor != null ) ? descriptor.Name : null;
+        return ( PropertyDescriptor != null )
+          ? PropertyDescriptor.PropertyType
+          : null;
       }
     }
 
-    #endregion //PropertyDescriptor
+    #endregion //PropertyType
 
-    #region PropertyOrder
+    #region DescriptorDefinition
 
-    public static readonly DependencyProperty PropertyOrderProperty =
-        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
-
-    public int PropertyOrder
+    internal DescriptorPropertyDefinitionBase DescriptorDefinition
     {
-      get { return ( int )GetValue( PropertyOrderProperty ); }
-      set { SetValue( PropertyOrderProperty, value ); }
+      get;
+      private set;
     }
 
-    #endregion //PropertyOrder
+    #endregion DescriptorDefinition
 
-    #region PropertyType
+    #region Instance
 
-    public Type PropertyType
+    public object Instance
     {
-      get
-      {
-        return ( PropertyDescriptor != null )
-          ? PropertyDescriptor.PropertyType
-          : null;
-      }
+      get;
+      internal set;
     }
 
-    #endregion //PropertyType
+    #endregion //Instance
 
-    #region Value
+    #endregion //Properties
 
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnValueChanged, OnCoerceValueChanged ) );
-    public object Value
+    #region Methods
+
+    protected override void OnIsExpandedChanged( bool oldValue, bool newValue )
     {
-      get
+      if( newValue )
       {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
+        // This withholds the generation of all PropertyItem instances (recursively)
+        // until the PropertyItem is expanded.
+        var objectContainerHelper = ContainerHelper as ObjectContainerHelperBase;
+        if( objectContainerHelper != null )
+        {
+          objectContainerHelper.GenerateProperties();
+        }
       }
     }
 
-    private static object OnCoerceValueChanged( DependencyObject o, object baseValue )
+    protected override void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
     {
-      PropertyItem prop = o as PropertyItem;
-      if( prop != null )
-        return prop.OnCoerceValueChanged( baseValue );
+      if( oldValue != null )
+        oldValue.DataContext = null;
 
-      return baseValue;
+      if( newValue != null )
+        newValue.DataContext = this;
     }
 
-    protected virtual object OnCoerceValueChanged( object baseValue )
+    protected override object OnCoerceValueChanged( object baseValue )
     {
       // Propagate error from DescriptorPropertyDefinitionBase to PropertyItem.Value
       // to see the red error rectangle in the propertyGrid.
@@ -368,102 +176,32 @@ protected virtual object OnCoerceValueChanged( object baseValue )
       return baseValue;
     }
 
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    protected override void OnValueChanged( object oldValue, object newValue )
     {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-      {
-        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
-      }
-    }
+      base.OnValueChanged( oldValue, newValue );
 
-    protected virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      if( IsInitialized )
+      // Update the ObjectContainerHelper this depends on 
+      var helper = new ObjectContainerHelper( this, newValue );
+      this.ContainerHelper = helper;
+      if( this.IsExpanded )
       {
-        RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+        helper.GenerateProperties();
       }
     }
 
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Events
-
-    #region ItemSelectionChanged
-
-    internal static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent(
-        "ItemSelectionChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItem ) );
-
-    private void RaiseItemSelectionChangedEvent()
-    {
-      RaiseEvent( new RoutedEventArgs( PropertyItem.ItemSelectionChangedEvent ) );
-    }
-
-    #endregion
-
-    #region ItemOrderingChanged
-
-    internal static readonly RoutedEvent ItemOrderingChangedEvent = EventManager.RegisterRoutedEvent(
-        "ItemOrderingChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItem ) );
-
-    private void RaiseItemOrderingChangedEvent()
-    {
-      RaiseEvent( new RoutedEventArgs( PropertyItem.ItemOrderingChangedEvent ) );
-    }
-
     #endregion
 
-    #endregion //Events
-
     #region Constructors
 
-    static PropertyItem()
+    internal PropertyItem( DescriptorPropertyDefinitionBase definition )
+      : base()
     {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItem ), new FrameworkPropertyMetadata( typeof( PropertyItem ) ) );
-    }
+      if( definition == null )
+        throw new ArgumentNullException( "definition" );
 
-    internal PropertyItem()
-    {
-      Properties = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
-      AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( PropertyItem_PreviewMouseDown ), true );
-      AddHandler( PropertyItem.ItemOrderingChangedEvent, new RoutedEventHandler( OnItemOrderingChanged ), false );
+      this.DescriptorDefinition = definition;
     }
 
     #endregion //Constructors
-
-    #region Event Handlers
-
-    private void PropertyItem_PreviewMouseDown( object sender, MouseButtonEventArgs e )
-    {
-      IsSelected = true;
-    }
-
-    private void OnItemOrderingChanged( object sender, RoutedEventArgs args )
-    {
-      if( args.OriginalSource != this )
-      {
-        //If the OriginalSource is not this object, it comes from one of our children.
-        Properties.RefreshView();
-        args.Handled = true;
-      }
-    }
-
-    #endregion  //Event Handlers
-
-    #region Methods
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( PropertyItemCollection.IsItemOrderingProperty( e.Property.Name ) )
-      {
-        this.RaiseItemOrderingChangedEvent();
-      }
-    }
-
-    #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
new file mode 100644
index 000000000..914d3171a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
@@ -0,0 +1,459 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Data;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Reflection;
+using System.Linq.Expressions;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  [TemplatePart( Name = PropertyGrid.PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
+  [TemplatePart( Name = PropertyItemBase.PART_ValueContainer, Type = typeof( ContentControl ) )]
+  public abstract class PropertyItemBase : Control, IPropertyContainer, INotifyPropertyChanged
+  {
+    internal const string PART_ValueContainer = "PART_ValueContainer";
+
+    private ContentControl _valueContainer;
+    private ContainerHelperBase _containerHelper;
+    private IPropertyContainer _parentNode;
+
+    #region Properties
+
+    #region AdvancedOptionsIcon
+
+    public static readonly DependencyProperty AdvancedOptionsIconProperty =
+        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public ImageSource AdvancedOptionsIcon
+    {
+      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
+      set { SetValue( AdvancedOptionsIconProperty, value ); }
+    }
+
+    #endregion //AdvancedOptionsIcon
+
+    #region AdvancedOptionsTooltip
+
+    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
+        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public object AdvancedOptionsTooltip
+    {
+      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
+      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
+    }
+
+    #endregion //AdvancedOptionsTooltip
+
+
+
+
+
+
+    #region Description
+
+    public static readonly DependencyProperty DescriptionProperty =
+        DependencyProperty.Register( "Description", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public string Description
+    {
+      get { return ( string )GetValue( DescriptionProperty ); }
+      set { SetValue( DescriptionProperty, value ); }
+    }
+
+    #endregion //Description
+
+    #region DisplayName
+
+    public static readonly DependencyProperty DisplayNameProperty =
+        DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public string DisplayName
+    {
+      get { return ( string )GetValue( DisplayNameProperty ); }
+      set { SetValue( DisplayNameProperty, value ); }
+    }
+
+    #endregion //DisplayName
+
+    #region Editor
+
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItemBase ), new UIPropertyMetadata( null, OnEditorChanged ) );
+    public FrameworkElement Editor
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( EditorProperty );
+      }
+      set
+      {
+        SetValue( EditorProperty, value );
+      }
+    }
+
+    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
+    }
+
+    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
+    {
+    }
+
+    #endregion //Editor
+
+    #region IsExpanded
+
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
+    public bool IsExpanded
+    {
+      get
+      {
+        return ( bool )GetValue( IsExpandedProperty );
+      }
+      set
+      {
+        SetValue( IsExpandedProperty, value );
+      }
+    }
+
+    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItemBase propertyItem = o as PropertyItemBase;
+      if( propertyItem != null )
+        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
+    {
+    }
+
+    #endregion IsExpanded
+
+    #region IsExpandable
+
+    public static readonly DependencyProperty IsExpandableProperty =
+        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
+
+    public bool IsExpandable
+    {
+      get { return ( bool )GetValue( IsExpandableProperty ); }
+      set { SetValue( IsExpandableProperty, value ); }
+    }
+
+    #endregion //IsExpandable
+
+    #region IsSelected
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItemBase propertyItem = o as PropertyItemBase;
+      if( propertyItem != null )
+        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      this.RaiseItemSelectionChangedEvent();
+    }
+
+    #endregion //IsSelected
+
+    #region ParentElement
+    /// <summary>
+    /// Gets the parent property grid element of this property.
+    /// A PropertyItemBase instance if this is a sub-element, 
+    /// or the PropertyGrid itself if this is a first-level property.
+    /// </summary>
+    public FrameworkElement ParentElement
+    {
+      get { return this.ParentNode as FrameworkElement; }
+    }
+    #endregion
+
+    #region ParentNode
+
+    internal IPropertyContainer ParentNode
+    {
+      get
+      {
+        return _parentNode;
+      }
+      set
+      {
+        _parentNode = value;
+      }
+    }
+    #endregion
+
+    #region ValueContainer
+
+    internal ContentControl ValueContainer
+    {
+      get
+      {
+        return _valueContainer;
+      }
+    }
+
+    #endregion
+
+    #region Level
+
+    public int Level
+    {
+      get;
+      internal set;
+    }
+
+    #endregion //Level
+
+    #region Properties
+
+    public IList Properties
+    {
+      get
+      {
+        return _containerHelper.Properties;
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyContainerStyle
+    /// <summary>
+    /// Get the PropertyContainerStyle for sub items of this property.
+    /// It return the value defined on PropertyGrid.PropertyContainerStyle.
+    /// </summary>
+    public Style PropertyContainerStyle 
+    {
+      get
+      {
+        return ( ParentNode != null )
+        ? ParentNode.PropertyContainerStyle
+        : null;
+      }
+    }
+    #endregion
+
+    #region ContainerHelper
+
+    internal ContainerHelperBase ContainerHelper
+    {
+      get
+      {
+        return _containerHelper;
+      }
+      set
+      {
+        if( value == null )
+          throw new ArgumentNullException( "value" );
+
+        _containerHelper = value;
+        // Properties property relies on the "Properties" property of the helper
+        // class. Raise a property-changed event.
+        this.RaisePropertyChanged( () => this.Properties );
+      }
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Events
+
+    #region ItemSelectionChanged
+
+    internal static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent(
+        "ItemSelectionChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItemBase ) );
+
+    private void RaiseItemSelectionChangedEvent()
+    {
+      RaiseEvent( new RoutedEventArgs( PropertyItemBase.ItemSelectionChangedEvent ) );
+    }
+
+    #endregion
+
+    #region PropertyChanged event
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    internal void RaisePropertyChanged<TMember>( Expression<Func<TMember>> propertyExpression )
+    {
+      this.Notify( this.PropertyChanged, propertyExpression );
+    }
+    internal void RaisePropertyChanged( string name )
+    {
+      this.Notify( this.PropertyChanged, name );
+    }
+    #endregion
+
+    #endregion //Events
+
+    #region Constructors
+
+    static PropertyItemBase()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItemBase ), new FrameworkPropertyMetadata( typeof( PropertyItemBase ) ) );
+    }
+
+    internal PropertyItemBase()
+    {
+      _containerHelper = new ObjectContainerHelper( this, null );
+      this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
+      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
+      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
+      args.PropertyItem.Level = this.Level + 1;
+      _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
+
+      args.Handled = true;
+    }
+
+    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
+      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
+      args.PropertyItem.Level = 0;
+
+      args.Handled = true;
+    }
+
+    #endregion  //Event Handlers
+
+    #region Methods
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      _containerHelper.ChildrenItemsControl = GetTemplateChild( PropertyGrid.PART_PropertyItemsControl ) as PropertyItemsControl;
+      _valueContainer = GetTemplateChild( PropertyItemBase.PART_ValueContainer ) as ContentControl;
+    }
+
+    protected override void OnMouseDown( MouseButtonEventArgs e )
+    {
+      IsSelected = true;
+      if( !this.IsKeyboardFocusWithin )
+      {
+        this.Focus();
+      }
+      // Handle the event; otherwise, the possible 
+      // parent property item will select itself too.
+      e.Handled = true;
+    }
+
+    private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
+    { 
+      IsSelected = true;
+      // Handle the event; otherwise, the possible 
+      // parent property item will select itself too.
+      e.Handled = true;
+    }
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+
+      // First check that the raised property is actually a real CLR property.
+      // This could be something else like an Attached DP.
+      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) )
+      {
+        this.RaisePropertyChanged( e.Property.Name );
+      }
+    }
+
+    #endregion //Methods
+
+    #region IPropertyContainer Members
+
+
+
+    Style IPropertyContainer.PropertyContainerStyle
+    {
+      get { return this.PropertyContainerStyle; }
+    }
+
+    EditorDefinitionCollection IPropertyContainer.EditorDefinitions
+    {
+      get { return ParentNode.EditorDefinitions; }
+    }
+
+    PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions
+    {
+      get { return null; }
+    }
+
+    ContainerHelperBase IPropertyContainer.ContainerHelper 
+    {
+      get
+      {
+        return this.ContainerHelper;
+      }
+    }
+
+    bool IPropertyContainer.IsCategorized 
+    {
+      get { return false; }
+    }
+
+    bool IPropertyContainer.AutoGenerateProperties
+    {
+      get { return true; }
+    }
+
+    FilterInfo IPropertyContainer.FilterInfo
+    {
+      get { return new FilterInfo(); }
+    }
+
+    #endregion
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
index bfdecf3b6..5855168f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -30,10 +30,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   public class PropertyItemCollection : ReadOnlyObservableCollection<PropertyItem>
   {
-    private static readonly string CategoryPropertyName;
-    private static readonly string CategoryOrderPropertyName;
-    private static readonly string PropertyOrderPropertyName;
-    private static readonly string DisplayNamePropertyName;
+    internal static readonly string CategoryPropertyName;
+    internal static readonly string CategoryOrderPropertyName;
+    internal static readonly string PropertyOrderPropertyName;
+    internal static readonly string DisplayNamePropertyName;
 
     private bool _preventNotification;
 
@@ -52,6 +52,12 @@ public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollect
       EditableCollection = editableCollection;
     }
 
+    internal Predicate<object> FilterPredicate
+    {
+      get { return GetDefaultView().Filter; }
+      set { GetDefaultView().Filter = value; }
+    }
+
     public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
 
     private ICollectionView GetDefaultView()
@@ -71,14 +77,8 @@ public void SortBy( string name, ListSortDirection sortDirection )
 
     public void Filter( string text )
     {
-      if( text == null )
-        return;
-
-      GetDefaultView().Filter = ( item ) =>
-      {
-        var property = item as PropertyItem;
-        return property.DisplayName.ToLower().StartsWith( text.ToLower() );
-      };
+      Predicate<object> filter = PropertyItemCollection.CreateFilter( text );
+      GetDefaultView().Filter = filter;
     }
 
     protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
@@ -89,42 +89,42 @@ protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs ar
       base.OnCollectionChanged( args );
     }
 
-    internal void Update( IEnumerable<PropertyItem> newItems,  bool isCategorized, string filter )
+    internal void UpdateItems( IEnumerable<PropertyItem> newItems )
     {
+      if( newItems == null )
+        throw new ArgumentNullException( "newItems" );
+
+      _preventNotification = true;
       using( GetDefaultView().DeferRefresh() )
       {
-        _preventNotification = true;
-
-        // Replace the collection content with the new items.
-        if( newItems != null )
+        EditableCollection.Clear();
+        foreach( var item in newItems )
         {
-          EditableCollection.Clear();
-          foreach( var item in newItems )
-          {
-            this.EditableCollection.Add( item );
-          }
+          this.EditableCollection.Add( item );
         }
+      }
+      _preventNotification = false;
+      OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+    }
 
-        // Clear view values
-        ICollectionView view = this.GetDefaultView();
+    internal void UpdateCategorization( GroupDescription groupDescription )
+    {
+      // Clear view values
+      ICollectionView view = this.GetDefaultView();
+      using( view.DeferRefresh() )
+      {
         view.GroupDescriptions.Clear();
         view.SortDescriptions.Clear();
-        view.Filter = null;
 
         // Update view values
-        if( isCategorized )
+        if( groupDescription != null )
         {
-          GroupBy( CategoryPropertyName );
+          view.GroupDescriptions.Add( groupDescription );
           SortBy( CategoryPropertyName, ListSortDirection.Ascending );
         }
 
         SortBy( PropertyOrderPropertyName, ListSortDirection.Ascending );
         SortBy( DisplayNamePropertyName, ListSortDirection.Ascending );
-
-        Filter( filter );
-
-        _preventNotification = false;
-        OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
       }
     }
 
@@ -133,12 +133,25 @@ internal void RefreshView()
       GetDefaultView().Refresh();
     }
 
-    internal static bool IsItemOrderingProperty( string propertyName )
+    internal static Predicate<object> CreateFilter( string text )
     {
-      return string.Equals( propertyName, DisplayNamePropertyName )
-        || string.Equals( propertyName, CategoryPropertyName )
-        || string.Equals( propertyName, CategoryOrderPropertyName )
-        || string.Equals( propertyName, PropertyOrderPropertyName );
+      Predicate<object> filter = null;
+
+      if( !string.IsNullOrEmpty( text ) )
+      {
+        filter = ( item ) =>
+        {
+          var property = item as PropertyItem;
+          if( property.DisplayName != null )
+          {
+            return property.DisplayName.ToLower().StartsWith( text.ToLower() );
+          }
+
+          return false;
+        };
+      }
+
+      return filter;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
new file mode 100644
index 000000000..588326a76
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
@@ -0,0 +1,96 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// This Control is intended to be used in the template of the 
+  /// PropertyItemBase and PropertyGrid classes to contain the
+  /// sub-children properties.
+  /// </summary>
+  public class PropertyItemsControl : ItemsControl
+  {
+
+    #region PreparePropertyItemEvent Attached Routed Event
+
+    internal static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
+    internal event PropertyItemEventHandler PreparePropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
+      }
+    }
+
+    private void RaisePreparePropertyItemEvent( PropertyItemBase propertyItem, object item )
+    {
+      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.PreparePropertyItemEvent, this, propertyItem, item ) );
+    }
+
+    #endregion
+
+    #region ClearPropertyItemEvent Attached Routed Event
+
+    internal static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
+    internal event PropertyItemEventHandler ClearPropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
+      }
+    }
+
+    private void RaiseClearPropertyItemEvent( PropertyItemBase propertyItem, object item )
+    {
+      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.ClearPropertyItemEvent, this, propertyItem, item ) );
+    }
+
+    #endregion
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return ( item is PropertyItemBase );
+    }
+
+
+    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
+    {
+      base.PrepareContainerForItemOverride( element, item );
+      this.RaisePreparePropertyItemEvent( ( PropertyItemBase )element, item );
+    }
+
+    protected override void ClearContainerForItemOverride( DependencyObject element, object item )
+    {
+      this.RaiseClearPropertyItemEvent( ( PropertyItemBase )element, item );
+      base.ClearContainerForItemOverride( element, item );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
new file mode 100644
index 000000000..d1445c040
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
@@ -0,0 +1,59 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// This class is intended to provide the "Type" target
+  /// for property definitions or editor definitions when
+  /// using Property Element Syntax.
+  /// </summary>
+  public sealed class TargetPropertyType
+  {
+    private Type _type;
+    private bool _sealed;
+
+    public Type Type
+    {
+      get { return _type; }
+      set 
+      {
+        if( _sealed )
+          throw new InvalidOperationException(
+            string.Format(
+            "{0}.Type property cannot be modified once the instance is used",
+            typeof( TargetPropertyType ) ) );
+
+        _type = value; 
+      }
+    }
+
+    internal void Seal()
+    {
+      if( _type == null )
+        throw new InvalidOperationException(
+          string.Format( "{0}.Type property must be initialized", typeof( TargetPropertyType ) ) );
+
+      _sealed = true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c950c4ed4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,512 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
+                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
+                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- PropertyGrid                                                                    -->
+    <!-- =============================================================================== -->
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+
+    <x:Static x:Key="EmptyString" Member="sys:String.Empty" />
+
+    <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Height" Value="22" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+        <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+        <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Grid SnapsToDevicePixels="True">
+                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="0" />
+                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0">
+                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0" Padding="{TemplateBinding Padding}">
+                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                                    <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                                </StackPanel>
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                        </Trigger>
+
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Height" Value="22" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+        <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+        <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid SnapsToDevicePixels="True">
+                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="0" />
+                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0">
+                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0" Padding="{TemplateBinding Padding}">
+                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                                    <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                                </StackPanel>
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                        </Trigger>
+
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="Black" />
+
+    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+        <Grid>
+            <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+            <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                        <SkewTransform AngleX="0" AngleY="0" />
+                        <RotateTransform Angle="-90" />
+                        <TranslateTransform X="0" Y="0" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+            <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                        <SkewTransform AngleX="0" AngleY="0" />
+                        <RotateTransform Angle="135" />
+                        <TranslateTransform X="0" Y="0" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+                <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Background" Value="#FFF0F0F0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" x:Name="ContentRow" />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="20" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                                <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                            </Grid>
+                        </Border>
+                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="{x:Static SystemColors.ControlBrush}" Padding="10 0 0 0">
+                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+        <Setter Property="Padding" Value="10 0 0 0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Grid>
+                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ContextMenu x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type pg:PropertyGrid}, 
+                  ResourceId=SelectedObjectAdvancedOptionsMenu}">
+        <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+    </ContextMenu>
+
+    <Style TargetType="{x:Type pg:PropertyItemBase}">
+      <Setter Property="Background" Value="{x:Static SystemColors.WindowBrush}" />
+      <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->       
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="None"/>
+      <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
+                    <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" 
+                            ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                     <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
+                            <Border x:Name="PART_Name"
+                                    Background="{TemplateBinding Background}" 
+                             Margin="0,0,1,0" 
+                             VerticalAlignment="Stretch" 
+                             HorizontalAlignment="Stretch" >
+                        <Grid Margin="2,2,2,2" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="15" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                              <ToggleButton Grid.Column="0"
+                                            Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" 
+                                         HorizontalAlignment="Stretch" 
+                                         VerticalAlignment="Center"
+                                         TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                                    <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
+
+                                        <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding AdvancedOptionsIcon, RelativeSource={RelativeSource TemplatedParent}}"
+                                     ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </Grid>
+                                </Grid>
+                            </Border>
+
+                            <Border x:Name="PART_Editor" Grid.Column="1" 
+                                                               Background="{TemplateBinding Background}" 
+                           VerticalAlignment="Stretch" 
+                           HorizontalAlignment="Stretch">
+                        <ContentControl x:Name="PART_ValueContainer" 
+                                          Content="{TemplateBinding Editor}" 
+                                          Focusable="False" IsTabStop="False" 
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                                </ContentControl>
+                            </Border>
+
+                            <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                                <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                 ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <VirtualizingStackPanel />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </pg:PropertyItemsControl>
+                            </Expander>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Name" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Name" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" TargetName="PART_ValueContainer"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
+                        </Trigger>
+                        <Trigger Property="Validation.HasError" Value="true">
+                            <Setter Property="ToolTip"
+                                Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type pg:PropertyGrid}">
+        <Style.Resources>
+            <pgconv:SelectedObjectConverter x:Key="objectConverter" />
+        </Style.Resources>
+
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="SelectedObjectType" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
+        <Setter Property="SelectedObjectTypeName" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=TypeName}" />
+        <Setter Property="SelectedObjectName" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject.Name, FallbackValue={StaticResource EmptyString}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Margin="{TemplateBinding Padding}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition />
+                                <RowDefinition Height="5" />
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <StackPanel Orientation="Horizontal" Margin="6,2,0,4"
+                                 Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" />
+                                <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
+                            </StackPanel>
+
+                            <Grid x:Name="toolsContainer" Grid.Row="1" Margin="4,0,4,4">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid x:Name="sortButtonContainer" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <StackPanel Orientation="Horizontal" Margin="1" >
+                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                            <Image Source="./../Images/Categorize16.png" Width="16" Height="16" />
+                                        </RadioButton>
+                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                            <Image Source="./../Images/SortAscending16.png" Width="16" Height="16" />
+                                        </RadioButton>
+                                    </StackPanel>
+                                </Grid>
+
+                                <Border x:Name="searchBoxContainer" Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <local:WatermarkTextBox x:Name="_txtFilter"
+                                                      Background="Transparent" 
+                                                      Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                      Watermark="{TemplateBinding FilterWatermark}">
+                                            <local:WatermarkTextBox.Style>
+                                                <Style TargetType="Control">
+                                                    <Setter Property="BorderThickness" Value="0" />
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="BorderThickness" Value="1" />
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </local:WatermarkTextBox.Style>
+
+                                        </local:WatermarkTextBox>
+
+                                        <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                            <Image Source="./../Images/ClearFilter16.png" Width="16" Height="16" />
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+
+                            <Grid Grid.Row="2" Background="{x:Static SystemColors.WindowBrush}">
+                                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                    <pg:PropertyItemsControl  x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                     ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     Background="{x:Static SystemColors.ControlBrush}"
+                                                     VerticalAlignment="Top">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+
+                                        <ItemsControl.GroupStyle>
+                                            <GroupStyle>
+                                                <GroupStyle.ContainerStyle>
+                                                    <Style TargetType="{x:Type GroupItem}">
+                                                        <Setter Property="Template">
+                                                            <Setter.Value>
+                                                                <ControlTemplate>
+                                                                    <Border>
+                                                                        <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                                            <ItemsPresenter />
+                                                                        </Expander>
+                                                                    </Border>
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </Style>
+                                                </GroupStyle.ContainerStyle>
+                                            </GroupStyle>
+                                        </ItemsControl.GroupStyle>
+
+                                    </pg:PropertyItemsControl>
+                                </ScrollViewer>
+
+                                <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                                    <Thumb.Template>
+                                        <ControlTemplate>
+                                            <Border Background="Transparent" />
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+
+                            </Grid>
+
+                            <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition SourceName="searchBoxContainer" Property="Visibility" Value="Collapsed"/>
+                                <Condition SourceName="sortButtonContainer" Property="Visibility" Value="Collapsed"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="toolsContainer" Property="Visibility" Value="Collapsed" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
index 37667b92e..89a5c0f8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -253,8 +253,8 @@
                         <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
                      </Grid>
                   </Border>
-                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
-                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="{x:Static SystemColors.ControlBrush}" Padding="10 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
                         <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
                      </Border>
                   </Border>
@@ -293,31 +293,42 @@
       </Setter>
    </Style>
 
-   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+   <ContextMenu x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type pg:PropertyGrid}, 
+                  ResourceId=SelectedObjectAdvancedOptionsMenu}">
       <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
    </ContextMenu>
 
-   <Style TargetType="{x:Type pg:PropertyItem}">
-      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
-      <Setter Property="BorderThickness" Value="1" />
+   <Style TargetType="{x:Type pg:PropertyItemBase}">
+      <Setter Property="Background" Value="{x:Static SystemColors.WindowBrush}" />
+      <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
       <Setter Property="Focusable" Value="True" />
-      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="None"/>
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type pg:PropertyItem}">
-               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" ContextMenuService.Placement="Bottom">
-                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+            <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
+               <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" 
+                       ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
                         <ColumnDefinition Width="*" />
                      </Grid.ColumnDefinitions>
                      <Grid.RowDefinitions>
                         <RowDefinition />
-                        <RowDefinition />
+                        <RowDefinition Height="Auto" />
                      </Grid.RowDefinitions>
 
-                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
-                        <Grid Margin="2,2,2,2">
+                     <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
+                     <Border x:Name="PART_Name"
+                             Background="{TemplateBinding Background}" 
+                             Margin="0,0,1,0" 
+                             VerticalAlignment="Stretch" 
+                             HorizontalAlignment="Stretch">
+                        <Grid Margin="2,2,2,2" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="*" />
                               <ColumnDefinition Width="Auto" />
@@ -329,14 +340,16 @@
                                  <ColumnDefinition Width="*" />
                               </Grid.ColumnDefinitions>
 
-                              <Border Grid.Column="0">
-                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                                               OverridesDefaultStyle="True"
-                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                               Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                              </Border>
+                              <ToggleButton Grid.Column="0"
+                                            Template="{StaticResource ExpanderToggleButton}"
+                                            OverridesDefaultStyle="True"
+                                            IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
 
-                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" 
+                                         HorizontalAlignment="Stretch" 
+                                         VerticalAlignment="Center"
+                                         TextTrimming="CharacterEllipsis" />
                            </Grid>
 
                            <Grid Grid.Column="1"
@@ -355,19 +368,28 @@
                         </Grid>
                      </Border>
 
-                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
-                        <ContentControl x:Name="content" Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" 
-                                        IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}"/>
+                     <Border x:Name="PART_Editor" Grid.Column="1" 
+                           Background="{TemplateBinding Background}" 
+                           VerticalAlignment="Stretch" 
+                           HorizontalAlignment="Stretch">
+                        <ContentControl x:Name="PART_ValueContainer" 
+                                          Content="{TemplateBinding Editor}" 
+                                          Focusable="False" IsTabStop="False" 
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                        </ContentControl>
                      </Border>
 
                      <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
-                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                        <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                 ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
                                  <VirtualizingStackPanel />
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
-                        </ItemsControl>
+                        </pg:PropertyItemsControl>
                      </Expander>
                   </Grid>
                </Border>
@@ -380,7 +402,7 @@
                      <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" TargetName="content"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
+                     <Setter Property="Foreground" TargetName="PART_ValueContainer"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
                   </Trigger>
                   <Trigger Property="Validation.HasError" Value="true">
                         <Setter Property="ToolTip"
@@ -396,8 +418,7 @@
       <Style.Resources>
          <pgconv:SelectedObjectConverter x:Key="objectConverter" />
       </Style.Resources>
-      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
-      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="Background" Value="#BCC7D8" />
       <Setter Property="BorderBrush" Value="#43577B" />
       <Setter Property="BorderThickness" Value="1" />
       <Setter Property="SelectedObjectType" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
@@ -407,7 +428,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
                <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                  <Grid>
+                  <Grid Margin="{TemplateBinding Padding}">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto" />
@@ -427,19 +448,19 @@
                            <ColumnDefinition Width="Auto" />
                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <Grid x:Name="sortButtonContainer" Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid x:Name="sortButtonContainer" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
                            <StackPanel Orientation="Horizontal" Margin="1" >
                               <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
                                            VerticalAlignment="Center"
                                            Style="{StaticResource OptionsToggleButtonStyle}"
                                            ToolTip="Categorized">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/Categorize16.png" Width="16" Height="16" />
                               </RadioButton>
                               <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                            VerticalAlignment="Center"
                                            Style="{StaticResource OptionsToggleButtonStyle}"
                                            ToolTip="Alphabetical">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/SortAscending16.png" Width="16" Height="16" />
                               </RadioButton>
                            </StackPanel>
                         </Grid>
@@ -471,15 +492,19 @@
                                       Command="commands:PropertyGridCommands.ClearFilter"
                                       Style="{StaticResource ClearFilterButtonStyle}"
                                       HorizontalAlignment="Left">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/ClearFilter16.png" Width="16" Height="16" />
                               </Button>
                            </Grid>
                         </Border>
                      </Grid>
 
-                     <Grid Grid.Row="2" Background="White">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto">
-                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                     <Grid Grid.Row="2" Background="{x:Static SystemColors.WindowBrush}">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto" >
+                           <pg:PropertyItemsControl  x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                     ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     Background="{x:Static SystemColors.ControlBrush}"
+                                                     VerticalAlignment="Top">
                               <ItemsControl.ItemsPanel>
                                  <ItemsPanelTemplate>
                                     <VirtualizingStackPanel />
@@ -493,10 +518,8 @@
                                           <Setter Property="Template">
                                              <Setter.Value>
                                                 <ControlTemplate>
-                                                   <Border Background="{TemplateBinding Background}"
-                                                           BorderBrush="{TemplateBinding BorderBrush}"
-                                                           BorderThickness="{TemplateBinding BorderThickness}">
-                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                   <Border >
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True" >
                                                          <ItemsPresenter />
                                                       </Expander>
                                                    </Border>
@@ -508,7 +531,7 @@
                                  </GroupStyle>
                               </ItemsControl.GroupStyle>
 
-                           </ItemsControl>
+                           </pg:PropertyItemsControl>
                         </ScrollViewer>
 
                          <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
index 5e99ae536..ddbdfd465 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Documents;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
index 4de259e29..bb6d1ff3d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Documents;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
index 4b038750d..aaca7b13a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.IO;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
index 2a4ff7e40..30ed667a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.IO;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index 90d1a1687..3e42b0287 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,8 +25,8 @@ public class RichTextBox : System.Windows.Controls.RichTextBox
   {
     #region Private Members
 
-    private bool _textSetInternally;
-    bool _surpressGetText;
+    private bool _preventDocumentUpdate;
+    private bool _preventTextUpdate;
 
     #endregion //Private Members
 
@@ -63,24 +63,7 @@ public string Text
 
     private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      RichTextBox rtb = ( RichTextBox )d;
-
-      // if the text is not being set internally then load the text into the RichTextBox
-      if( !rtb._textSetInternally )
-      {
-        //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
-        //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
-        //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
-        rtb._surpressGetText = true;
-        DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke( new Action( delegate()
-            {
-              rtb.TextFormatter.SetText( rtb.Document, ( string )e.NewValue );
-            } ), DispatcherPriority.Background );
-        dop.Completed += ( sender, ea ) =>
-            {
-              rtb._surpressGetText = false;
-            };
-      }
+      ( ( RichTextBox )d ).UpdateDocumentFromText();
     }
 
     private static object CoerceTextProperty( DependencyObject d, object value )
@@ -92,30 +75,31 @@ private static object CoerceTextProperty( DependencyObject d, object value )
 
     #region TextFormatter
 
-    private ITextFormatter _textFormatter;
-    /// <summary>
-    /// The ITextFormatter the is used to format the text of the RichTextBox.
-    /// Deafult formatter is the RtfFormatter
-    /// </summary>
+    public static readonly DependencyProperty TextFormatterProperty = DependencyProperty.Register( "TextFormatter", typeof( ITextFormatter ), typeof( RichTextBox ), new FrameworkPropertyMetadata( new RtfFormatter(), OnTextFormatterPropertyChanged ) );
     public ITextFormatter TextFormatter
     {
       get
       {
-        if( _textFormatter == null )
-          _textFormatter = new RtfFormatter(); //default is rtf
-
-        return _textFormatter;
+        return ( ITextFormatter )GetValue( TextFormatterProperty );
       }
       set
       {
-        if( _textFormatter != value )
-        {
-          _textFormatter = value;
-          _textFormatter.SetText( Document, Text );
-        }
+        SetValue( TextFormatterProperty, value );
       }
     }
 
+    private static void OnTextFormatterPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBox richTextBox = d as RichTextBox;
+      if( richTextBox != null )
+        richTextBox.OnTextFormatterPropertyChanged( ( ITextFormatter )e.OldValue, ( ITextFormatter )e.NewValue );
+    }
+
+    protected virtual void OnTextFormatterPropertyChanged( ITextFormatter oldValue, ITextFormatter newValue )
+    {
+      this.UpdateTextFromDocument();
+    }
+
     #endregion //TextFormatter
 
     #endregion //Properties
@@ -125,17 +109,27 @@ public ITextFormatter TextFormatter
     protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
     {
       base.OnTextChanged( e );
-      UpdateText();
+      UpdateTextFromDocument();
     }
 
-    private void UpdateText()
+    private void UpdateTextFromDocument()
     {
-      _textSetInternally = true;
+      if( _preventTextUpdate )
+        return;
 
-      if( !_surpressGetText )
-        Text = TextFormatter.GetText( Document );
+      _preventDocumentUpdate = true;
+      Text = TextFormatter.GetText( Document );
+      _preventDocumentUpdate = false;
+    }
 
-      _textSetInternally = false;
+    private void UpdateDocumentFromText()
+    {
+      if( _preventDocumentUpdate )
+        return;
+
+      _preventTextUpdate = true;
+      TextFormatter.SetText( Document, Text );
+      _preventTextUpdate = false;
     }
 
     /// <summary>
@@ -146,6 +140,28 @@ public void Clear()
       Document.Blocks.Clear();
     }
 
+    public override void BeginInit()
+    {
+      base.BeginInit();
+      // Do not update anything while initializing. See EndInit
+      _preventTextUpdate = true;
+      _preventDocumentUpdate = true;
+    }
+
+    public override void EndInit()
+    {
+      base.EndInit();
+      _preventTextUpdate = false;
+      _preventDocumentUpdate = false;
+      // Possible conflict here if the user specifies 
+      // the document AND the text at the same time 
+      // in XAML. Text has priority.
+      if( !string.IsNullOrEmpty( Text ) )
+        UpdateDocumentFromText();
+      else
+        UpdateTextFromDocument();
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
index 0b8f522e6..27469dc0f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
index 5ef300240..b00978011 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <UserControl x:Class="Xceed.Wpf.Toolkit.RichTextBoxFormatBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -191,7 +191,7 @@
                               </Grid.ColumnDefinitions>
 
                               <Grid>
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
+                                 <Image Source="./Images/FontColorPicker16.png" Width="16" Height="16" />
                                  <Rectangle Grid.Row="1"
                                             Height="4"
                                             Margin="0,12,0,0"
@@ -286,7 +286,7 @@
                               </Grid.ColumnDefinitions>
 
                               <Grid>
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
+                                 <Image Source="./Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
                                  <Rectangle Grid.Row="1"
                                             Height="4"
                                             Margin="0,12,0,0"
@@ -392,7 +392,7 @@
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              Click="Bullets_Clicked"
                              ToolTip="Bullets">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Bullets16.png" />
+                  <Image Source="./Images/Bullets16.png" />
                </ToggleButton>
 
                <ToggleButton x:Name="_btnNumbers"
@@ -401,7 +401,7 @@
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              Click="Numbers_Clicked"
                              ToolTip="Numbering">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Numbering16.png" />
+                  <Image Source="./Images/Numbering16.png" />
                </ToggleButton>
 
             </StackPanel>
@@ -412,21 +412,21 @@
                              Command="EditingCommands.ToggleBold"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Bold">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Bold16.png" />
+                  <Image Source="./Images/Bold16.png" />
                </ToggleButton>
                <ToggleButton x:Name="_btnItalic"
                              Style="{StaticResource FormatBarToggleButtonStyle}"
                              Command="{x:Static EditingCommands.ToggleItalic}"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Italic">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Italic16.png" />
+                  <Image Source="./Images/Italic16.png" />
                </ToggleButton>
                <ToggleButton x:Name="_btnUnderline"
                              Style="{StaticResource FormatBarToggleButtonStyle}"
                              Command="{x:Static EditingCommands.ToggleUnderline}"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Underline">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Underline16.png" />
+                  <Image Source="./Images/Underline16.png" />
                </ToggleButton>
 
                <Separator />
@@ -436,21 +436,21 @@
                             Command="{x:Static EditingCommands.AlignLeft}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Left">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+                  <Image Source="./Images/LeftAlign16.png" />
                </RadioButton>
                <RadioButton x:Name="_btnAlignCenter"
                             Style="{StaticResource FormatBarToggleButtonStyle}"
                             Command="{x:Static EditingCommands.AlignCenter}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Center">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+                  <Image Source="./Images/CenterAlign16.png" />
                </RadioButton>
                <RadioButton x:Name="_btnAlignRight"
                             Style="{StaticResource FormatBarToggleButtonStyle}"
                             Command="{x:Static EditingCommands.AlignRight}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Right">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+                  <Image Source="./Images/RightAlign16.png" />
                </RadioButton>
 
                <Separator />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
index 9a94c379a..0b9a59441 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
@@ -21,6 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core;
 using System.Linq;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -76,7 +77,7 @@ public RichTextBoxFormatBar()
       InitializeComponent();
       Loaded += FormatToolbar_Loaded;
 
-      _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies.OrderBy( fontFamily => fontFamily.Source );
+      _cmbFontFamilies.ItemsSource = FontUtilities.Families.OrderBy( fontFamily => fontFamily.Source );
       _cmbFontSizes.ItemsSource = FontSizes;
     }
 
@@ -166,14 +167,24 @@ private void UpdateToggleButtonState()
 
     void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
     {
-      object currentValue = Target.Selection.GetPropertyValue( formattingProperty );
-      button.IsChecked = ( currentValue == DependencyProperty.UnsetValue ) ? false : currentValue != null && currentValue.Equals( expectedValue );
+      object currentValue = DependencyProperty.UnsetValue;
+      if( (Target != null) && (Target.Selection != null) )
+      {
+        currentValue = Target.Selection.GetPropertyValue( formattingProperty );
+      }
+      button.IsChecked = ( (currentValue == null) || ( currentValue == DependencyProperty.UnsetValue ) )
+                          ? false 
+                          : currentValue != null && currentValue.Equals( expectedValue );
     }
 
     private void UpdateSelectedFontFamily()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
-      FontFamily currentFontFamily = ( FontFamily )( ( value == DependencyProperty.UnsetValue ) ? null : value );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
+      }
+      FontFamily currentFontFamily = ( FontFamily )( ( ( value == null) || ( value == DependencyProperty.UnsetValue ) ) ? null : value );
       if( currentFontFamily != null )
       {
         _cmbFontFamilies.SelectedItem = currentFontFamily;
@@ -182,21 +193,39 @@ private void UpdateSelectedFontFamily()
 
     private void UpdateSelectedFontSize()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
-      _cmbFontSizes.SelectedValue = ( value == DependencyProperty.UnsetValue ) ? null : value;
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
+      }
+
+      _cmbFontSizes.SelectedValue = ( ( value == null ) || ( value == DependencyProperty.UnsetValue ) ) ? null : value;
     }
 
     private void UpdateFontColor()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
-      Color currentColor = ( Color )( ( value == DependencyProperty.UnsetValue ) ? Colors.Black : ( ( SolidColorBrush )value ).Color );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
+      }
+
+      Color currentColor = ( Color )( ( (value == null) || ( value == DependencyProperty.UnsetValue ) )
+                                    ? Colors.Black 
+                                    : ( ( SolidColorBrush )value ).Color );
       _cmbFontColor.SelectedColor = currentColor;
     }
 
     private void UpdateFontBackgroundColor()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
-      Color currentColor = ( Color )( ( value == null || value == DependencyProperty.UnsetValue ) ? Colors.Transparent : ( ( SolidColorBrush )value ).Color );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
+      }
+      Color currentColor = ( Color )( ( (value == null ) || (value == DependencyProperty.UnsetValue) )
+                                      ? Colors.Transparent 
+                                      : ( ( SolidColorBrush )value ).Color );
       _cmbFontBackgroundColor.SelectedColor = currentColor;
     }
 
@@ -209,8 +238,12 @@ private void UpdateSelectionListType()
       _btnBullets.IsChecked = false;
       _btnNumbers.IsChecked = false;
 
-      Paragraph startParagraph = Target.Selection.Start.Paragraph;
-      Paragraph endParagraph = Target.Selection.End.Paragraph;
+      Paragraph startParagraph = ( ( Target != null ) && ( Target.Selection != null ) ) 
+                                  ? Target.Selection.Start.Paragraph 
+                                  : null;
+      Paragraph endParagraph = ( ( Target != null ) && ( Target.Selection != null ) )
+                                ? Target.Selection.End.Paragraph
+                                : null;
       if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
       {
         TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
@@ -236,7 +269,7 @@ private bool BothSelectionListsAreChecked()
 
     void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
     {
-      if( value == null )
+      if( ( value == null ) || ( Target == null ) || ( Target.Selection == null ) )
         return;
 
       Target.Selection.ApplyPropertyValue( formattingProperty, value );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index 8694f711b..c23c76f6e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
index e090d8f56..e45d20ad4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..dc2b5b6a6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,122 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- SplitButton                                                                     -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:SplitButton}">
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:SplitButton}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <ContentPresenter />
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                    <Grid>
+                                        <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                             Background="{TemplateBinding Background}" 
+                                                             BorderThickness="1,1,0,1"
+                                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											                 RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                 RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                            <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                                        </chrome:ButtonChrome>
+                                    </Grid>
+                                </Button>
+                                <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                                    <ToggleButton.Template>
+                                        <ControlTemplate TargetType="ToggleButton">
+                                            <ContentPresenter />
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                    <Grid>
+                                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                             Background="{TemplateBinding Background}" 
+                                                             Padding="1,0,1,0"
+                                                             RenderChecked="{TemplateBinding IsOpen}"
+                                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											                 RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                 RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                            <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                                <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                            </Grid>
+                                        </chrome:ButtonChrome>
+                                    </Grid>
+                                </ToggleButton>
+                            </Grid>
+                        </chrome:ButtonChrome>
+
+                        <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                            <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding DropDownContent}" />
+                            </Border>
+                        </Popup>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="ActionButtonChrome" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index 5b49e9f4d..99642ce83 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -1,24 +1,25 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
@@ -47,7 +48,7 @@
       <Setter Property="IsTabStop" Value="False" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
       <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
       <Setter Property="Padding" Value="3" />
       <Setter Property="Template">
          <Setter.Value>
@@ -67,8 +68,8 @@
                            </Button.Template>
                            <Grid>
                               <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
-                                                   RenderNormal="False"
+                                                   BorderThickness="1,1,0,1"
+                                                   CornerRadius="2.75, 0, 0, 2.75"
                                                    RenderEnabled="{TemplateBinding IsEnabled}"
 											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
 											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
@@ -87,9 +88,9 @@
                               </ControlTemplate>
                            </ToggleButton.Template>
                            <Grid>
-                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                   Padding="1,0,1,0"
                                                    CornerRadius="0, 2.75, 2.75, 0"
-                                                   RenderNormal="False"
                                                    RenderChecked="{TemplateBinding IsOpen}"
                                                    RenderEnabled="{TemplateBinding IsEnabled}"
 											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs
new file mode 100644
index 000000000..325edc669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs
@@ -0,0 +1,42 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Converters
+{
+  public class StylableWindowClippingBorderConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      Type aa = value.GetType();
+      Type b = parameter.GetType();
+      double borderThickness = ( double )value - double.Parse( (string)parameter );
+      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
index b8dd1d700..6224595a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
index 770c840e8..6c5cee81d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
index 3417322db..c8b55270c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..f64c234fc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,58 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Brushes.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Buttons.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Common.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Chromes/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/BusyIndicator/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ButtonSpinner/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Calculator/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CalculatorUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Aero2/WindowControl.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Aero2/SelectorItem.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorCanvas/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorPicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DropDownButton/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MessageBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimePicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/NumericUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/SplitButton/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Themes/Aero2.NormalColor.xaml" />
+
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/TimePicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Wizard/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Zoombox/Themes/Aero2.NormalColor.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
new file mode 100644
index 000000000..2024b5895
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
@@ -0,0 +1,51 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<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"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+
+    <!-- Control -->
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#FFF4F4F4" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" Color="#FFABADB3" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" Color="#FF7EB4EA" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlSelectedBorderKey}" Color="#FF569DE5" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" Color="Red" options:Freeze="true" />
+
+    <!-- Button -->
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" Color="#FFDDDDDD" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" Color="#FFBEE6FD" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" Color="#FFC4E5F6" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="Red" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" Color="Orange" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#FFADB2B5" options:Freeze="true" />
+
+    <!-- Up/Down Glyphs -->
+    <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+    <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#FFA9A9A9" />
+
+    <!-- SpinButton CornerRadius -->
+    <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" options:Freeze="true" />
+
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
new file mode 100644
index 000000000..bbb5b937f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
@@ -0,0 +1,50 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="2,2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Grid>
+                        <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
new file mode 100644
index 000000000..9465cc301
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
@@ -0,0 +1,141 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <!-- =============================================================================== -->
+    <!-- Geometry for Close/Minimize/Maximize buttons                                    -->
+    <!-- =============================================================================== -->
+    <Geometry x:Key="closeGeometry">
+        M1,0 L0,1 3,4 0,7 1,8 2,8 2,7 4,5 7,8 8,8 8,7 5,4 8,1 7,0 5,2 5,3 4,3 1,0
+    </Geometry>
+    <Geometry x:Key="minimizeGeometry">
+        M0,0 L8,0 8,1 8,2 0,2 0,1 z
+    </Geometry>
+    <Geometry x:Key="maximizeGeometry">
+        M0,0 L8,0 8,1 0,1 z M0,0 L8,0 8,8 0,8 z
+    </Geometry>
+
+
+    <!-- =============================================================================== -->
+    <!-- Common Styles                                                                   -->
+    <!-- Need to find a way to share these for WindowControl and StylableWindow          -->
+    <!-- =============================================================================== -->
+
+    <!-- ResizeGrip -->
+    <ImageBrush x:Key="resize_grip"
+                ImageSource="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/resize_grip.png" />
+
+    <!-- New Button Template without MouseOver and Pressed triggers -->
+    <ControlTemplate x:Key="WindowButtonTemplate" TargetType="Button">
+        <Border Name="border" 
+                Padding="1" 
+                BorderThickness="0"
+                Background="{TemplateBinding Background}">
+            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Border>
+    </ControlTemplate>
+
+    <!--Default Close button style-->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}" TargetType="Button" >
+        <Setter Property="Background" Value="#FFC75050" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template" Value="{StaticResource WindowButtonTemplate}" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
+                <Setter Property="Background" Value="#FFBCBCBC" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#FFE04343" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#FF993D3D" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+
+
+    <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="Gray" />
+
+    <SolidColorBrush x:Key="Window_WindowBackground" Color="{x:Static media:WindowColors.ColorizationColor}" />
+
+    <SolidColorBrush x:Key="Window_Background"  Color="White"/>
+
+    <SolidColorBrush x:Key="Window_WindowInactiveBackground" Color="#FFEBEBEB" />
+
+    <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
+
+    <SolidColorBrush x:Key="Window_CaptionShadowBrush" Color="Transparent" />
+
+    <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
+
+    <!-- Panel Background -->
+    <LinearGradientBrush x:Key="PanelBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFF0F0F0" />
+                <GradientStop Offset="1" Color="#FFE5E5E5" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!-- Popup Background -->
+    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFF0F0F0" />
+                <GradientStop Offset="1" Color="#FFE5E5E5" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!-- Popup Border -->
+    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvas, ColorPicker                                                        -->
+    <!-- =============================================================================== -->
+
+    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="White">
+                    <GeometryDrawing.Geometry>
+                        <RectangleGeometry Rect="0,0 100,100" />
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="LightGray">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0 50,50" />
+                            <RectangleGeometry Rect="50,50 50,50" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
new file mode 100644
index 000000000..94bac7f6c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
@@ -0,0 +1,67 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+    <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+    <DataTemplate x:Key="IncreaseGlyphNormalKey">
+        <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+    <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+        <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="DecreaseGlyphNormalKey">
+        <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+        <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
index b938877be..3637b13d5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
@@ -29,6 +29,8 @@
 
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Calculator/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Generic/WindowControl.xaml" />
+      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Generic/SelectorItem.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Generic.xaml" />
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
index 69186e61b..b91f925f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
index 2c9f5dcf3..e3279aa2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
index 66feb7141..1db4b85a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
@@ -1,152 +1,245 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <!-- =============================================================================== -->
-   <!-- Common Styles                                                                   -->
-   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
-   <!-- =============================================================================== -->
-
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-                        Height="6"
-                        Width="7"
-                        Stretch="Fill"
-                        Opacity="1"
-                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-                        Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+
+    <!-- =============================================================================== -->
+    <!-- Images for the buttons and their various states                                 -->
+    <!-- =============================================================================== -->
+
+    <!-- ResizeGrip -->
+    <ImageBrush x:Key="resize_grip" 
+                ImageSource="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/resize_grip.png" />
+
+   <Style x:Key="buttonImageStyle" TargetType="Image">
+      <Setter Property="Stretch" Value="None" />
+      <Setter Property="UseLayoutRounding" Value="True" />
+      <Setter Property="RenderOptions.EdgeMode" Value="Aliased" />
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor" />
    </Style>
 
+    <!-- Minimize -->
+   <Image x:Key="minimize_normal"
+               Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_normal.png" />
+   <Image x:Key="minimize_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_hover.png" />
+   <Image x:Key="minimize_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_pressed.png" />
+   <Image x:Key="minimize_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_inactive.png" />
+
+    <!-- Maximize -->
+   <Image x:Key="maximize_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_normal.png" />
+   <Image x:Key="maximize_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_hover.png" />
+   <Image x:Key="maximize_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_pressed.png" />
+   <Image x:Key="maximize_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_inactive.png" />
+   <Image x:Key="maximize_disabled"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_disabled.png" />
+
+    <!-- Restore -->
+   <Image x:Key="restore_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_normal.png" />
+   <Image x:Key="restore_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_hover.png" />
+   <Image x:Key="restore_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_pressed.png" />
+   <Image x:Key="restore_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_inactive.png" />
+   <Image x:Key="restore_disabled"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_disabled.png" />
+
+    <!-- Close -->
+   <Image x:Key="close_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_normal.png" />
+   <Image x:Key="close_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_hover.png" />
+   <Image x:Key="close_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_pressed.png" />
+   <Image x:Key="close_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_inactive.png" />
+
+    <!-- Close (with 2 rounded corners) -->
+   <Image x:Key="close_rounded_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_normal.png" />
+   <Image x:Key="close_rounded_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_hover.png" />
+   <Image x:Key="close_rounded_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_pressed.png" />
+   <Image x:Key="close_rounded_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_inactive.png" />
+
+    <!-- Close (for ToolWindow) -->
+   <Image x:Key="close_toolwindow_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_normal.png" />
+   <Image x:Key="close_toolwindow_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_hover.png" />
+   <Image x:Key="close_toolwindow_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_pressed.png" />
+   <Image x:Key="close_toolwindow_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_inactive.png" />
 
+
+    <!-- =============================================================================== -->
+    <!-- Common Styles                                                                   -->
+    <!-- Need to find a way to share these for WindowControl and StylableWindow          -->
     <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type primitives:SelectorItem}">
-        <Setter Property="Background"
-           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-        <Setter Property="IsTabStop"
-               Value="False" />
-
-        <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-               <Border x:Name="_background"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}">
-                    <CheckBox Foreground="{TemplateBinding Foreground}"
-                              IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                </Border>
-               <ControlTemplate.Triggers>
-                 <Trigger Property="IsMouseOver" Value="true">
-                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                </Trigger>
-                <Trigger Property="IsKeyboardFocusWithin" Value="true">
-                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                </Trigger>
-            </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+
+    <!-- Button template -->
+    <ControlTemplate x:Key="buttonTemplate" TargetType="Button">
+        <Border Name="outerBorder" 
+                Background="{TemplateBinding Background}" 
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+        </Border>
+    </ControlTemplate>
+
+   <Style x:Key="windowButtonBaseStyle" TargetType="Button">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Margin" Value="0,-1,0,0" />
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template" Value="{StaticResource buttonTemplate}" />
    </Style>
 
+    <!--Default Close button style-->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}"
+           TargetType="Button" 
+          BasedOn="{StaticResource windowButtonBaseStyle}">
+      <Setter Property="ToolTip" Value="Close" />
+      <Setter Property="Content" Value="{StaticResource close_normal}" />
+        <Style.Triggers>
+            <!-- Regular Window -->
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
+                <Setter Property="Content" Value="{StaticResource close_inactive}" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+            <Setter Property="Content" Value="{StaticResource close_hover}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+            <Setter Property="Content" Value="{StaticResource close_pressed}" />
+            </Trigger>
+
+            <!-- NoResize (Close button with 2 rounded corners) -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_inactive}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=IsMouseOver}" Value="True" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_hover}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=IsPressed}" Value="True" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_pressed}" />
+            </MultiDataTrigger>
+
+            <!-- Tool Window -->
+            <Trigger Property="Name" Value="PART_ToolWindowCloseButton">
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_normal}" />
+            </Trigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=Name}" Value="PART_ToolWindowCloseButton" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_inactive}" />
+            </MultiDataTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
+                    <Condition Property="IsMouseOver" Value="True" />
+                </MultiTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_hover}" />
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
+                    <Condition Property="IsPressed" Value="True" />
+                </MultiTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_pressed}" />
+            </MultiTrigger>
+
+        </Style.Triggers>
+    </Style>
+
+
+
+
+
+
+   <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="#FF252C33" />
+
+   <conv:ColorBlendConverter x:Key="Window_WindowBackground_converter" BlendedColor="#FFA0A0A0" BlendedColorRatio="0.35" />
+   <SolidColorBrush x:Key="Window_WindowBackground" 
+                    Color="{Binding 
+                        Source={x:Static media:WindowColors.ColorizationColor}, 
+                        Converter={StaticResource Window_WindowBackground_converter}}" 
+                    Opacity="0.85"/>
+
+   <SolidColorBrush x:Key="Window_Background"  Color="White"/>
+
+   <conv:ColorBlendConverter x:Key="Window_WindowInactiveBackground_converter" BlendedColor="#FFF0F0F0" BlendedColorRatio="0.67" />
+   <SolidColorBrush x:Key="Window_WindowInactiveBackground" 
+                    Color="{Binding 
+                        Source={x:Static media:WindowColors.ColorizationColor}, 
+                        Converter={StaticResource Window_WindowInactiveBackground_converter}}" 
+                    Opacity="0.85"/>
+
+   <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
+
+   <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
+
+   <!-- ========================================================================= -->
+   <!-- Used by ColorPicker and ColorCanvas                                       -->
+   <!-- ========================================================================= -->
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
index 1b523aae8..c9f66a9b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png
new file mode 100644
index 000000000..3fe5c9193
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png
new file mode 100644
index 000000000..1b4619285
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png
new file mode 100644
index 000000000..d7fcb801d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png
new file mode 100644
index 000000000..e406e334f
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png
new file mode 100644
index 000000000..a8ef093a0
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png
new file mode 100644
index 000000000..fac35369d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png
new file mode 100644
index 000000000..7d8fede6d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png
new file mode 100644
index 000000000..0ee5dfbd9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png
new file mode 100644
index 000000000..9a2987ec2
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png
new file mode 100644
index 000000000..4f9773535
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png
new file mode 100644
index 000000000..bf0669623
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png
new file mode 100644
index 000000000..1c3d9a5e3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png
new file mode 100644
index 000000000..d9805399e
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png
new file mode 100644
index 000000000..4715f7d6b
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png
new file mode 100644
index 000000000..3755d81a6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png
new file mode 100644
index 000000000..713a1a2f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png
new file mode 100644
index 000000000..ec5d431b8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png
new file mode 100644
index 000000000..c4c0496c6
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png
new file mode 100644
index 000000000..204ea5cc3
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png
new file mode 100644
index 000000000..648703926
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png
new file mode 100644
index 000000000..3ab1ec5e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png
new file mode 100644
index 000000000..8a0859718
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png
new file mode 100644
index 000000000..1683f61d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png
new file mode 100644
index 000000000..9f1a27e55
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png
new file mode 100644
index 000000000..da3f7787c
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png
new file mode 100644
index 000000000..595eb1fee
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png
new file mode 100644
index 000000000..c94c7016d
Binary files /dev/null and b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
new file mode 100644
index 000000000..6d617a307
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero-based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
index d35041def..dc2d0db76 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
index 3eaffc0a5..b7baac60c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index 283cef8b0..320dd54dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -22,6 +22,7 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Input;
 using System.Windows.Controls.Primitives;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Collections.Generic;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -581,16 +582,17 @@ public IEnumerable GenerateTimeListItemsSource()
       }
 
       TimeSpan timeInterval = TimeInterval;
+      List<TimeItem> timeItemList = new List<TimeItem>();
 
       if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
       {
         while( time <= endTime )
         {
-          yield return this.CreateTimeItem( time );
+          timeItemList.Add( this.CreateTimeItem( time ) );
           time = time.Add( timeInterval );
         }
-        yield break;
       }
+      return timeItemList;
     }
 
     private TimeItem CreateTimeItem( TimeSpan time )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..dfbaccfd0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,183 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                        </chrome:ButtonChrome>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border Name="Border" BorderThickness="1"  SnapsToDevicePixels="true">
+                        <ContentPresenter Margin="4" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+
+                        <!-- MouseOver Only -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFB8E0F3" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF26A0DA" />
+                        </MultiTrigger>
+
+                        <!-- Selected Only -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="False" />
+                                <Condition Property="IsSelected" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFC4E5F6" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF26A0DA" />
+                        </MultiTrigger>
+
+                        <!-- MouseOver + Selected -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFD1E8FF" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF66A7E8" />
+                        </MultiTrigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- TimePicker                                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:TimePicker}">
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:TimePicker}">
+                    <Border>
+                        <Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              TabIndex="{TemplateBinding TabIndex}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" 
+                                              TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                            </Grid>
+                            <Popup x:Name="PART_Popup"
+                            IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                                <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                    <Grid>
+                                        <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                                    </Grid>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                           <Setter TargetName="PART_TimeUpDown" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TimeUpDown}" />
+                        </Trigger>
+                  </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
index 3e4dda2d6..045df1bbd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -28,7 +28,7 @@
    <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -129,12 +129,13 @@
                                               Foreground="{TemplateBinding Foreground}"
                                               ContextMenu="{TemplateBinding ContextMenu}"
                                               AllowSpin="{TemplateBinding AllowSpin}"
+                                              TabIndex="{TemplateBinding TabIndex}"
                                               Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
                                               FormatString="{TemplateBinding FormatString}"
                                               ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
                                               Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
                                               Watermark="{TemplateBinding Watermark}"
-                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" 
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}"
                                               TextAlignment="{TemplateBinding TextAlignment}"/>
                         <ToggleButton x:Name="_timePickerToggleButton"
                                       Grid.Column="1"
@@ -159,6 +160,11 @@
                      </Popup>
                   </Grid>
                </Border>
+                <ControlTemplate.Triggers>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TimeUpDown" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TimeUpDown}" />
+                   </Trigger>
+               </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
index 959c90af1..8592f3e7d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
index 3125af7ed..f2f56c578 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index f0869d59b..2f8f99dba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
index 25cdba8f9..145e2092e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index aa76b1dc7..e40726ae9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..da8174875
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,85 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" />
+    </DataTemplate>
+
+
+    <!-- =============================================================================== -->
+    <!-- WatermarkTextBox                                                                -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:WatermarkTextBox}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+                    <Grid>
+
+                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="0" Background="{TemplateBinding Background}" />
+                        <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="Text" Value="" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
index ebe7272f6..979a6032c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
index bba1cd048..dd67204d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -1,24 +1,25 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -394,6 +395,11 @@ private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
 
       if( CurrentPage != null )
       {
+        var eventArgs = new CancelRoutedEventArgs( NextEvent );
+        this.RaiseEvent( eventArgs );
+        if( eventArgs.Cancel )
+          return;
+
         //check next page
         if( CurrentPage.NextPage != null )
           nextPage = CurrentPage.NextPage;
@@ -430,6 +436,11 @@ private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e
 
       if( CurrentPage != null )
       {
+        var eventArgs = new CancelRoutedEventArgs( PreviousEvent );
+        this.RaiseEvent( eventArgs );
+        if( eventArgs.Cancel )
+          return;
+
         //check previous page
         if( CurrentPage.PreviousPage != null )
           previousPage = CurrentPage.PreviousPage;
@@ -464,6 +475,8 @@ private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventA
 
     #region Events
 
+    #region Cancel Event
+
     public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Cancel
     {
@@ -477,6 +490,10 @@ public event RoutedEventHandler Cancel
       }
     }
 
+    #endregion //Cancel Event
+
+    #region PageChanged Event
+
     public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler PageChanged
     {
@@ -490,6 +507,10 @@ public event RoutedEventHandler PageChanged
       }
     }
 
+    #endregion //PageChanged Event
+
+    #region Finish Event
+
     public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Finish
     {
@@ -503,6 +524,10 @@ public event RoutedEventHandler Finish
       }
     }
 
+    #endregion //Finish Event
+
+    #region Help Event
+
     public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Help
     {
@@ -516,6 +541,60 @@ public event RoutedEventHandler Help
       }
     }
 
+    #endregion //Help Event
+
+    #region Next Event
+
+    public delegate void NextRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+    /// <summary>
+    /// Identifies the Next routed event.
+    /// </summary>
+    public static readonly RoutedEvent NextEvent = EventManager.RegisterRoutedEvent( "Next", RoutingStrategy.Bubble, typeof( NextRoutedEventHandler ), typeof( Wizard ) );
+    /// <summary>
+    /// Raised when WizardCommands.NextPage command is executed.
+    /// This cancellable event can prevent the command execution from continuing.
+    /// </summary>
+    public event NextRoutedEventHandler Next
+    {
+      add
+      {
+        AddHandler( NextEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( NextEvent, value );
+      }
+    }
+
+    #endregion //Next Event
+
+    #region Previous Event
+
+    public delegate void PreviousRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+    /// <summary>
+    /// Identifies the Previous routed event.
+    /// </summary>
+    public static readonly RoutedEvent PreviousEvent = EventManager.RegisterRoutedEvent( "Previous", RoutingStrategy.Bubble, typeof( PreviousRoutedEventHandler ), typeof( Wizard ) );
+    /// <summary>
+    /// Raised when WizardCommands.PreviousPage command is executed.
+    /// This cancellable event can prevent the command execution from continuing.
+    /// </summary>
+    public event PreviousRoutedEventHandler Previous
+    {
+      add
+      {
+        AddHandler( PreviousEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PreviousEvent, value );
+      }
+    }
+
+    #endregion //Previous Event
+
     #endregion //Events
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
index cc7f6f4cc..06931d6f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index cc42f4d07..8bea018c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -1,22 +1,23 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -280,6 +281,63 @@ static WizardPage()
       DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
     }
 
+    public WizardPage()
+    {
+      this.Loaded += new RoutedEventHandler( WizardPage_Loaded );
+      this.Unloaded += new RoutedEventHandler( WizardPage_Unloaded );
+    }
+
+    void WizardPage_Unloaded( object sender, RoutedEventArgs e )
+    {
+      base.RaiseEvent( new RoutedEventArgs( WizardPage.LeaveEvent, this ) );
+    }
+
+    void WizardPage_Loaded( object sender, RoutedEventArgs e )
+    {
+      if( this.IsVisible )
+      {
+        base.RaiseEvent( new RoutedEventArgs( WizardPage.EnterEvent, this ) );
+      }
+    }
+
     #endregion //Constructors
+
+    #region Events
+
+    #region Enter Event
+
+    public static readonly RoutedEvent EnterEvent = EventManager.RegisterRoutedEvent( "Enter", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
+    public event RoutedEventHandler Enter
+    {
+      add
+      {
+        AddHandler( EnterEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( EnterEvent, value );
+      }
+    }
+
+    #endregion //Enter Event
+
+    #region Leave Event
+
+    public static readonly RoutedEvent LeaveEvent = EventManager.RegisterRoutedEvent( "Leave", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
+    public event RoutedEventHandler Leave
+    {
+      add
+      {
+        AddHandler( LeaveEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( LeaveEvent, value );
+      }
+    }
+
+    #endregion //Leave Event
+
+    #endregion  //Events
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
index 771946ebd..6351252f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
index e124c2398..0a9d7668e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..08654b700
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,211 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
+
+    <Style TargetType="{x:Type local:Wizard}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <Grid />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Wizard}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                            <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,1,0,0" Padding="7">
+                                <StackPanel Background="{TemplateBinding Background}">
+                                    <Grid Margin="{TemplateBinding Padding}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                            <Button.Visibility>
+                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                                </MultiBinding>
+                                            </Button.Visibility>
+                                        </Button>
+                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                            <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                        </StackPanel>
+                                    </Grid>
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Grid Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+                </Grid>
+            </Border>
+            <Grid Column="1" Margin="14">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel>
+                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+                </StackPanel>
+                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </Grid>
+
+            <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                <Grid Background="{TemplateBinding Background}">
+                    <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                </Grid>
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WizardPage}">
+        <Style.Triggers>
+            <Trigger Property="PageType" Value="Blank">
+                <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+            </Trigger>
+            <Trigger Property="PageType" Value="Exterior">
+                <Setter Property="Background" Value="White" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="ExteriorPanelBackground" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+            </Trigger>
+            <Trigger Property="PageType" Value="Interior">
+                <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+                <Setter Property="BorderThickness" Value="0,1,0,0" />
+                <Setter Property="HeaderBackground" Value="White" />
+                <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
index 256c6ad0e..4786e5f67 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
index 1cb710e6e..119916130 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -49,30 +49,62 @@
     <Reference Include="PresentationFramework" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="BusyIndicator\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ButtonSpinner\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ButtonSpinner\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CalculatorUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CalculatorUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Calculator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Calculator\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CheckComboBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CheckListBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CheckListBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ChildWindow\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ChildWindow\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Chromes\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Chromes\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -81,14 +113,26 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="CollectionControl\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CollectionControl\Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ColorCanvas\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ColorCanvas\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ColorPicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ColorPicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -97,14 +141,42 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Core\Themes\Aero2\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Aero2\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Generic\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Generic\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DateTimePicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DateTimeUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DateTimeUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DropDownButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DropDownButton\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -113,14 +185,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MessageBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MessageBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MultiLineTextEditor\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="NumericUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="NumericUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -129,6 +213,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="PropertyGrid\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PropertyGrid\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -137,6 +225,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SplitButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SplitButton\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -145,6 +237,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Buttons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -153,6 +265,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\classic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -173,18 +289,50 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\luna.homestead.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.metallic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\royale.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TimePicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="WatermarkTextBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="WatermarkTextBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Wizard\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Wizard\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Zoombox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Zoombox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -215,7 +363,15 @@
     <Compile Include="CollectionControl\Implementation\CollectionControlDialog.xaml.cs">
       <DependentUpon>CollectionControlDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="CollectionControl\Implementation\Converters\NewItemTypesComboBoxConverter.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemAddingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemDeletingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemEventArgs.cs" />
     <Compile Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.cs" />
+    <Compile Include="Core\CancelRoutedEventArgs.cs" />
+    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
+    <Compile Include="Core\Converters\WindowContentBorderMarginConverter.cs" />
+    <Compile Include="Core\Converters\WindowControlBackgroundConverter.cs" />
     <Compile Include="Core\Input\IValidateInput.cs" />
     <Compile Include="Core\Input\InputValidationErrorEventArgs.cs" />
     <Compile Include="Core\Media\Animation\AnimationRate.cs" />
@@ -225,6 +381,7 @@
     <Compile Include="Core\Media\Animation\IterativeEquationConverter.cs" />
     <Compile Include="Core\Media\Animation\PennerEquation.cs" />
     <Compile Include="Core\Media\Animation\PennerEquations.cs" />
+    <Compile Include="Core\Media\WindowColors.cs" />
     <Compile Include="Core\Primitives\CachedTextInfo.cs" />
     <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
     <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
@@ -244,8 +401,18 @@
     <Compile Include="Core\Primitives\HsvColor.cs" />
     <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
     <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
+    <Compile Include="Core\Primitives\MouseWheelActiveTriggerEnum.cs" />
+    <Compile Include="Core\Primitives\WindowContainer.cs" />
+    <Compile Include="Core\Primitives\WindowControl.cs" />
+    <Compile Include="Core\Utilities\FontUtilities.cs" />
+    <Compile Include="Core\Utilities\GeneralUtilities.cs" />
     <Compile Include="Core\Utilities\KeyboardUtilities.cs" />
+    <Compile Include="Core\Utilities\ListUtilities.cs" />
+    <Compile Include="Core\Utilities\PropertyChangedExt.cs" />
     <Compile Include="Core\Utilities\RoutedEventHelper.cs" />
+    <Compile Include="Core\Utilities\WeakEventListener.cs" />
+    <Compile Include="Core\Utilities\WindowUtilities.cs" />
+    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
     <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
     <Compile Include="Panels\AnimatorConverter.cs" />
     <Compile Include="Panels\Animators.cs" />
@@ -280,7 +447,6 @@
     <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
     <Compile Include="Core\Utilities\DoubleHelper.cs" />
     <Compile Include="Core\Utilities\EllipseHelper.cs" />
-    <Compile Include="Core\Utilities\NotifyPropertyChangedHelper.cs" />
     <Compile Include="Core\Utilities\PointHelper.cs" />
     <Compile Include="Core\Utilities\RectHelper.cs" />
     <Compile Include="Core\Utilities\ReflectionHelper.cs" />
@@ -309,7 +475,7 @@
     <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
     <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
     <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
-    <Compile Include="Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
+    <Compile Include="Core\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
     <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
     <Compile Include="Magnifier\Implementation\Magnifier.cs" />
     <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
@@ -343,9 +509,20 @@
     <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\NewItemTypesAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\CommonPropertyExceptionValidationRule.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ListConverter.cs" />
     <Compile Include="PropertyGrid\Implementation\Converters\SelectedObjectConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\EditorTimeSpanConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\CustomPropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorTemplateDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\PropertyDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionBaseCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\FilterInfo.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelperBase.cs" />
     <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinitionBase.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml.cs">
@@ -354,7 +531,6 @@
     <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\EditorDefinitionCollection.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
@@ -367,15 +543,18 @@
     <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
     <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyParent.cs" />
+    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionCollection.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemsControl.cs" />
+    <Compile Include="PropertyGrid\Implementation\ContainerHelperBase.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemBase.cs" />
     <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelper.cs" />
+    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
     <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
     <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
       <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
@@ -390,6 +569,7 @@
     <Compile Include="Core\Primitives\UpDownBase.cs" />
     <Compile Include="SplitButton\Implementation\SplitButton.cs" />
     <Compile Include="Core\Themes\ResourceKeys.cs" />
+    <Compile Include="StylableWindow\Implementation\Converters\StylableWindowClippingBorderConverter.cs" />
     <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
     <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
     <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
@@ -494,6 +674,37 @@
   <ItemGroup>
     <Resource Include="CollectionControl\Images\Delete16.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\close_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_pressed.png" />
+    <Resource Include="Themes\Generic\Images\maximize_disabled.png" />
+    <Resource Include="Themes\Generic\Images\maximize_hover.png" />
+    <Resource Include="Themes\Generic\Images\maximize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\maximize_normal.png" />
+    <Resource Include="Themes\Generic\Images\maximize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\minimize_hover.png" />
+    <Resource Include="Themes\Generic\Images\minimize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\minimize_normal.png" />
+    <Resource Include="Themes\Generic\Images\minimize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\resize_grip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\restore_disabled.png" />
+    <Resource Include="Themes\Generic\Images\restore_hover.png" />
+    <Resource Include="Themes\Generic\Images\restore_inactive.png" />
+    <Resource Include="Themes\Generic\Images\restore_normal.png" />
+    <Resource Include="Themes\Generic\Images\restore_pressed.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..a3a78c969
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,598 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox">
+
+    <conv:RoundedValueConverter x:Key="RoundedValueConverter" Precision="2" />
+    <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
+      Inverted="False" Not="False" />
+    <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
+      Inverted="False" Not="True" />
+    <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
+      Inverted="True" Not="False" />
+    <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
+      Inverted="True" Not="True" />
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="white" />
+
+    <Style x:Key="TransparentButton" TargetType="{x:Type ButtonBase}"
+      BasedOn="{x:Null}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="Foreground" Value="#cccccc" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Grid Background="Transparent" Cursor="Hand">
+                        <Rectangle Fill="{TemplateBinding Background}"
+                Stroke="{TemplateBinding Foreground}" RadiusX="3" RadiusY="3"
+                x:Name="BackgroundTextBoxRectangle" Opacity="0" />
+                        <ContentPresenter />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ViewFinderToggleButtonStyle" BasedOn="{StaticResource TransparentButton}" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Visibility" Value="Visible" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}" Value="Hidden">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <DrawingImage x:Key="ShowViewFinderGlyph" >
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FF000000" Geometry="M8.823,9.895 
+              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
+              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
+              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
+              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
+              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
+              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
+              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
+              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
+              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
+              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z"/>
+                </DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#4B5F5F5F" Geometry="M0,0 L5.703,0 
+              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
+              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
+              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
+              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z"/>
+                </DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.867,9.820 L7.334,10.280 
+              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
+              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
+              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
+              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
+              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
+              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
+              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
+              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z"/>
+                </DrawingGroup>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="FillToBoundsGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
+              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
+              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
+              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
+              245.962,215.741L 249.378,215.741 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
+              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
+              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
+              249.383,237.31L 249.383,240.726 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
+              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
+              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
+              244.962,217.744L 247.539,220.321 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
+              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
+              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
+              228.295,240.73L 224.879,240.73 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
+              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
+              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
+              224.874,219.162L 224.874,215.746 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="FitContentGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
+              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
+              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
+              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
+              295.158,216.073L 298.574,216.073 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
+              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
+              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
+              298.579,237.642L 298.579,241.058 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
+              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
+              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
+              277.491,241.062L 274.075,241.062 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
+              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
+              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
+              274.07,219.494L 274.07,216.078 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="CenterGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
+              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
+              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
+              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
+              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
+              328.799,223.652 328.878,223.652 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="RefocusGlyph" >
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="1,0,0,1,0.667,1.667"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.624,0 C10.281,0 
+              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
+              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
+              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
+              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
+              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
+              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
+              2.966,0 6.624,0 z"/>
+                </DrawingGroup>
+                <GeometryDrawing Brush="#00FFFFFF">
+                    <GeometryDrawing.Geometry>
+                        <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,16,16"/>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="HomeGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
+              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round" Brush="transparent"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
+              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
+              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
+              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
+              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
+              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="PreviousGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="#00000000" Geometry="F1 M 8.47772,268.99L 
+              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round" Brush="Transparent"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}" Geometry="F1 M 
+              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="NextGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="#00000000" Geometry="F1 M 75.1444,415.886L 
+              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round" Brush="#00FFFFFF"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
+              26.3708,398.573 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="CloseXDrawingImage">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
+              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
+              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
+              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
+              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
+              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
+              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
+              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
+              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
+              508,385.523L 470.57,422.952 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <Style x:Key="{x:Type local:Zoombox}" TargetType="{x:Type local:Zoombox}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="PanDistance" Value="5.0" />
+        <Setter Property="ZoomOrigin" Value="0.5,0.5" />
+        <Setter Property="ZoomPercentage" Value="5.0" />
+        <Setter Property="DragModifiers" Value="Ctrl,Exact" />
+        <Setter Property="DragOnPreview" Value="False" />
+        <Setter Property="ZoomModifiers" Value="Shift,Exact" />
+        <Setter Property="ZoomOnPreview" Value="True" />
+        <Setter Property="RelativeZoomModifiers" Value="Ctrl,Alt,Exact" />
+        <Setter Property="ZoomToSelectionModifiers" Value="Alt,Exact" />
+        <Setter Property="NavigateOnPreview" Value="False" />
+        <Setter Property="ViewFinderVisibility" Value="Collapsed" />
+        <Setter Property="MinScale" Value="0.01" />
+        <Setter Property="MaxScale" Value="100.0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Zoombox}">
+                    <ControlTemplate.Resources>
+                        <SolidColorBrush x:Key="SelectionBrush" Color="Transparent" />
+                        <Pen x:Key="SelectionPen" Thickness="2.0" Brush="#7F3F3F3F" />
+                        <Pen x:Key="ViewportPen" Thickness="1.0" Brush="Red" />
+                        <InputBindingCollection x:Key="InputBindings">
+                            <KeyBinding Command="local:Zoombox.ZoomOut" Key="Left"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomOut" Key="Up"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomIn" Key="Right"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomIn" Key="Down"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.PanLeft" Key="Left"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanUp" Key="Up"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanRight" Key="Right"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanDown" Key="Down"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.Forward" Key="BrowserForward" />
+                            <KeyBinding Command="local:Zoombox.Back" Key="BrowserBack" />
+                            <KeyBinding Command="local:Zoombox.Back" Key="Back" />
+                        </InputBindingCollection>
+                    </ControlTemplate.Resources>
+                    <Grid Name="BackgroundGrid" Background="{TemplateBinding Background}">
+                        <ContentPresenter />
+                        <Border Name="ViewFinder" RenderTransformOrigin="1,1"
+                Background="#b0666666" BorderBrush="{TemplateBinding Foreground}"
+                BorderThickness="2" Opacity="0" Width="200" Height="190"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10"
+                CornerRadius="0" >
+                            <Border.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform x:Name="LayoutScaleTransform"
+                      ScaleX="0" ScaleY="0"/>
+                                </TransformGroup>
+                            </Border.RenderTransform>
+                            <Grid Margin="4">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,3">
+                                    <Button x:Name="BackButton" Command="local:Zoombox.Back"
+                      ToolTip="Go Back" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource PreviousGlyph}" />
+                                    </Button>
+                                    <Button x:Name="ForwardButton" Command="local:Zoombox.Forward"
+                      ToolTip="Go Forward" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource NextGlyph}"  />
+                                    </Button>
+                                    <Button x:Name="HomeButton" Command="local:Zoombox.Home"
+                      ToolTip="Go Home" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource HomeGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="FitButton" Command="local:Zoombox.Fit"
+                      ToolTip="Fit Content within Bounds" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource FitContentGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="FillButton" Command="local:Zoombox.Fill"
+                      ToolTip="Fill Bounds with Content" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource FillToBoundsGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="CenterButton" Command="local:Zoombox.Center"
+                      ToolTip="Center Content" Width="20px" Height="20px"
+                      Margin="2,0" Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource CenterGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="RefocusButton" Command="local:Zoombox.Refocus"
+                      Visibility="Collapsed" ToolTip="Refocus View"
+                      Width="20px" Height="20px" Margin="2,0"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource RefocusGlyph}" Margin="2"/>
+                                    </Button>
+                                </StackPanel>
+                                <ToggleButton x:Name="ToggleViewFinderButton"
+                    ToolTip="Hide View Finder" Height="13" Width="13"
+                    Margin="0,2,0,0" HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{StaticResource TransparentButton}" Foreground="White"
+                    IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}" >
+                                    <Image Source="{StaticResource CloseXDrawingImage}" Margin="2" />
+                                </ToggleButton>
+                                <Border Grid.Row="1" BorderBrush="{StaticResource GlyphBrush}"
+                    BorderThickness="2" Background="#80FFFFFF" />
+                                <local:ZoomboxViewFinderDisplay Grid.Row="1" Name="ViewFinderDisplay"
+                    ClipToBounds="True" Background="#C0FFFFFF" Margin="2" 
+                    ShadowBrush="#80FFFFFF" ViewportBrush="Transparent"
+                    ViewportPen="{StaticResource ViewportPen}" />
+                            </Grid>
+                        </Border>
+                        <ToggleButton Name="ShowViewFinder" IsTabStop="False"
+                ToolTip="Show View Finder" HorizontalAlignment="Right"
+                VerticalAlignment="Bottom" Margin="5" Height="22" Width="22"
+                FocusVisualStyle="{x:Null}"
+                Style="{StaticResource ViewFinderToggleButtonStyle}"
+                Foreground="Transparent" Background="Transparent"
+                IsChecked="{Binding Path=ViewFinderVisibility, 
+                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
+                    Converter={StaticResource TrueIfVisibleConverter}}">
+                            <Grid Name="ShowViewFinderGlyph" Opacity="0">
+                                <Image x:Name="ShowViewFinderGlyphImage" 
+                    Source="{StaticResource ShowViewFinderGlyph}" />
+                            </Grid>
+                        </ToggleButton>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="EffectiveViewStackMode" Value="Manual">
+                            <Setter TargetName="RefocusButton" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                        FillBehavior="HoldEnd" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                        FillBehavior="HoldEnd" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="False" SourceName="ShowViewFinder">
+                            <Setter Property="Focusable" Value="False" TargetName="BackButton" />
+                            <Setter Property="Focusable" Value="False"
+                  TargetName="ForwardButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="HomeButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="FitButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="FillButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="CenterButton" />
+                            <Setter Property="Focusable" Value="False"
+                  TargetName="ToggleViewFinderButton" />
+                        </Trigger>
+                        <EventTrigger RoutedEvent="ToggleButton.Checked"
+                SourceName="ShowViewFinder">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="ToggleButton.Unchecked"
+                SourceName="ShowViewFinder">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <!-- NOTE:  Order matters!
+          These triggers should be ordered according to the KeyModifiers assigned to 
+          each operation. If one operation requires Ctrl and another requires 
+          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
+          should appear *after* the trigger for the operation requiring only one. -->
+            <Trigger Property="AreDragModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+            <Trigger Property="AreZoomToSelectionModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="Cross" />
+            </Trigger>
+            <Trigger Property="AreZoomModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.Zoom}" />
+            </Trigger>
+            <Trigger Property="AreRelativeZoomModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
+            </Trigger>
+            <!-- The IsDraggingContent and IsSelectingRegion triggers should 
+           always be last. -->
+            <Trigger Property="IsDraggingContent" Value="True">
+                <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+            <Trigger Property="IsSelectingRegion" Value="True">
+                <Setter Property="Cursor" Value="Cross" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
index 6727077b7..0ebb9057a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
index b302370b4..1d0408a19 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
index 94b56cc6d..bdbd47a32 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Reflection;
 using System.Security;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
index 76482918d..124a27aa5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
index 46fdfc54e..1575827c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using Xceed.Wpf.Toolkit.Core;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
index ce9c09789..1931a414c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
index 62420e8c6..67cdaa7f2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
index 0972ffc12..52417ed4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
index c81c3f674..e2077a890 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
index 00ad3e315..ce90e01c5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 
 namespace Xceed.Wpf.Toolkit.Zoombox
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
index d53ad087a..d44acb9d8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
index 0ff00a4c1..b2cd4d22a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
index 7ba306491..e79fa42f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index 0ef54d8ca..4a6b2f46d 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -1,66 +1,21 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Src\Samples\Samples\Samples.csproj", "{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} = {1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}
-		{44733C25-7F22-4B91-83C7-4E654063DFD6} = {44733C25-7F22-4B91-83C7-4E654063DFD6}
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274} = {22F36E4A-98E6-4A1C-96CA-52CA46F19274}
-		{511FB369-57D2-430B-9002-F367DF165E70} = {511FB369-57D2-430B-9002-F367DF165E70}
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6} = {CBED4977-79ED-4E46-AA00-0A4D83D333A6}
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7} = {CAB850B9-1D47-4F45-A6A5-07B48599B5D7}
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342} = {10EFEFC6-F2CC-4C6E-955C-668B17F7F342}
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D} = {A36AB9C9-D813-4018-B341-8729A9B5BD7D}
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D} = {EF6701CF-21C3-45B5-9C90-40BE6130BB7D}
-	EndProjectSection
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit.LiveExplorer", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{01F2E61E-7F20-4F2E-8A3C-6604B18415B9}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Modules", "Modules", "{F927B3FE-820C-4EE1-921F-D10D3AE287AE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Infrastructure", "Src\Samples\Samples.Infrastructure\Samples.Infrastructure.csproj", "{A4A049A4-665A-4651-9046-7D06E9D0CCDC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.BusyIndicator", "Src\Samples\Modules\Samples.Modules.BusyIndicator\Samples.Modules.BusyIndicator.csproj", "{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Calculator", "Src\Samples\Modules\Samples.Modules.Calculator\Samples.Modules.Calculator.csproj", "{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.ChildWindow", "Src\Samples\Modules\Samples.Modules.ChildWindow\Samples.Modules.ChildWindow.csproj", "{44733C25-7F22-4B91-83C7-4E654063DFD6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Color", "Src\Samples\Modules\Samples.Modules.Color\Samples.Modules.Color.csproj", "{A36AB9C9-D813-4018-B341-8729A9B5BD7D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.DateTime", "Src\Samples\Modules\Samples.Modules.DateTime\Samples.Modules.DateTime.csproj", "{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Numeric", "Src\Samples\Modules\Samples.Modules.Numeric\Samples.Modules.Numeric.csproj", "{CBED4977-79ED-4E46-AA00-0A4D83D333A6}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Text", "Src\Samples\Modules\Samples.Modules.Text\Samples.Modules.Text.csproj", "{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Button", "Src\Samples\Modules\Samples.Modules.Button\Samples.Modules.Button.csproj", "{22F36E4A-98E6-4A1C-96CA-52CA46F19274}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.PropertyGrid", "Src\Samples\Modules\Samples.Modules.PropertyGrid\Samples.Modules.PropertyGrid.csproj", "{511FB369-57D2-430B-9002-F367DF165E70}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Wizard", "Src\Samples\Modules\Samples.Modules.Wizard\Samples.Modules.Wizard.csproj", "{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.TimelinePanel", "Src\Samples\Modules\Samples.Modules.TimelinePanel\Samples.Modules.TimelinePanel.csproj", "{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Zoombox", "Src\Samples\Modules\Samples.Modules.Zoombox\Samples.Modules.Zoombox.csproj", "{D6581837-4158-4165-BE2F-35EBF9742A54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Pie", "Src\Samples\Modules\Samples.Modules.Pie\Samples.Modules.Pie.csproj", "{08E7A934-4991-4CFC-BE12-B43AC6713122}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.CheckLists", "Src\Samples\Modules\Samples.Modules.CheckLists\Samples.Modules.CheckLists.csproj", "{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Magnifier", "Src\Samples\Modules\Samples.Modules.Magnifier\Samples.Modules.Magnifier.csproj", "{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.MessageBox", "Src\Samples\Modules\Samples.Modules.MessageBox\Samples.Modules.MessageBox.csproj", "{C324395B-C1D1-407B-8745-4AAC39B8BFD9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.DataGrid", "Src\Samples\Modules\Samples.Modules.DataGrid\Samples.Modules.DataGrid.csproj", "{129477D9-F413-495F-BE05-D049575BC16C}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{8976E4A6-FF5F-44C5-AC57-FEDA249DD199}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Themes", "Src\Samples\Modules\Samples.Modules.Themes\Samples.Modules.Themes.csproj", "{31D6DE81-60F1-4481-BE1B-96768855DA4E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.VS2010", "Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples.Modules.Panels", "Src\Samples\Modules\Samples.Modules.Panels\Samples.Modules.Panels.csproj", "{D51C9DFE-7661-4C32-A9D7-5772D366F578}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Metro", "Src\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.DataGrid", "Src\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj", "{63648392-6CE9-4A60-96D4-F9FD718D29B0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.AvalonDock.Themes.Aero", "Src\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -68,90 +23,10 @@ Global
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99}.Release|Mixed Platforms.Build.0 = Release|x86
-		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A4A049A4-665A-4651-9046-7D06E9D0CCDC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{44733C25-7F22-4B91-83C7-4E654063DFD6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{511FB369-57D2-430B-9002-F367DF165E70}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{511FB369-57D2-430B-9002-F367DF165E70}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D6581837-4158-4165-BE2F-35EBF9742A54}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D6581837-4158-4165-BE2F-35EBF9742A54}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{08E7A934-4991-4CFC-BE12-B43AC6713122}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{C324395B-C1D1-407B-8745-4AAC39B8BFD9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{129477D9-F413-495F-BE05-D049575BC16C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{129477D9-F413-495F-BE05-D049575BC16C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{129477D9-F413-495F-BE05-D049575BC16C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{129477D9-F413-495F-BE05-D049575BC16C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{31D6DE81-60F1-4481-BE1B-96768855DA4E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{31D6DE81-60F1-4481-BE1B-96768855DA4E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{31D6DE81-60F1-4481-BE1B-96768855DA4E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{31D6DE81-60F1-4481-BE1B-96768855DA4E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{D51C9DFE-7661-4C32-A9D7-5772D366F578}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{D51C9DFE-7661-4C32-A9D7-5772D366F578}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{D51C9DFE-7661-4C32-A9D7-5772D366F578}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{D51C9DFE-7661-4C32-A9D7-5772D366F578}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Mixed Platforms.Build.0 = Release|x86
 		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
 		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
@@ -160,32 +35,30 @@ Global
 		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
 		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{63648392-6CE9-4A60-96D4-F9FD718D29B0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{6EE69D18-F8AB-4CF9-AC3D-4719F36A8D99} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
-		{F927B3FE-820C-4EE1-921F-D10D3AE287AE} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
-		{A4A049A4-665A-4651-9046-7D06E9D0CCDC} = {01F2E61E-7F20-4F2E-8A3C-6604B18415B9}
-		{1A9C0E21-DE3B-4B2D-9EF0-39AA1922CDA6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{EF6701CF-21C3-45B5-9C90-40BE6130BB7D} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{44733C25-7F22-4B91-83C7-4E654063DFD6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{A36AB9C9-D813-4018-B341-8729A9B5BD7D} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{CAB850B9-1D47-4F45-A6A5-07B48599B5D7} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{CBED4977-79ED-4E46-AA00-0A4D83D333A6} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{10EFEFC6-F2CC-4C6E-955C-668B17F7F342} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{22F36E4A-98E6-4A1C-96CA-52CA46F19274} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{511FB369-57D2-430B-9002-F367DF165E70} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{DB0F7672-AFCC-4152-A231-7DCFDD5F219F} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{9FCBCEF6-6E41-4CD5-A49B-456890A038BA} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{D6581837-4158-4165-BE2F-35EBF9742A54} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{08E7A934-4991-4CFC-BE12-B43AC6713122} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{910A7A19-DD9F-4989-A001-BD7E5BAD2FE8} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{C3D3FFAD-2DA3-4142-8DE8-7045E347B63A} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{C324395B-C1D1-407B-8745-4AAC39B8BFD9} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{129477D9-F413-495F-BE05-D049575BC16C} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{31D6DE81-60F1-4481-BE1B-96768855DA4E} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
-		{D51C9DFE-7661-4C32-A9D7-5772D366F578} = {F927B3FE-820C-4EE1-921F-D10D3AE287AE}
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
+		{89286EB4-B4A1-418C-839A-067B00F442D8} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} = {8976E4A6-FF5F-44C5-AC57-FEDA249DD199}
 	EndGlobalSection
 EndGlobal
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index 52b871dbc..8b8ce9d3f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@@ -1,36 +1,30 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 [assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
 
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "1.9";
+  public const string BaseVersion = "2.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string Version = BaseVersion + 
   ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string PublicKeyToken = "ba83ff368b7563c6";
-  [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string DesignFullName =
-    "Xceed.Wpf.Toolkit,Version=" +
-    Version +
-    ",Culture=neutral,PublicKeyToken=" + PublicKeyToken;
-
 
 
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
index e67d3d81f..3316fb13a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 internal static class _XceedVersionInfoCommon
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
index 5d98b342e..0b2738c97 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index d22f66f78..d83c3666b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
index e52ab2230..141fbab99 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Input;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index 485f1cf91..d1ce2a793 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
index c34add1e1..b218170f9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..9372c7700
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,150 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- BusyIndicator                                                                   -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="BusyIndicatorTemplate" TargetType="{x:Type local:BusyIndicator}">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="VisibilityStates">
+                    <VisualState x:Name="Hidden">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Visible">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+                <VisualStateGroup x:Name="BusyStatusStates">
+                    <VisualState x:Name="Idle">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="Busy">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+            <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+            <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+            <ContentPresenter x:Name="busycontent">
+                <ContentPresenter.Content>
+                    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                        <Border Background="White" BorderThickness="1" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" CornerRadius="0">
+                            <Border Margin="1" Background="{TemplateBinding Background}" CornerRadius="0">
+                                <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                </Grid>
+                            </Border>
+                        </Border>
+                    </Grid>
+                </ContentPresenter.Content>
+            </ContentPresenter>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:BusyIndicator}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BusyContent" Value="Please wait..." />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="OverlayStyle">
+            <Setter.Value>
+                <Style TargetType="Rectangle">
+                    <Setter Property="Fill" Value="White" />
+                    <Setter Property="Opacity" Value="0.5" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ProgressBarStyle">
+            <Setter.Value>
+                <Style TargetType="ProgressBar">
+                    <Setter Property="IsIndeterminate" Value="True" />
+                    <Setter Property="Height" Value="15" />
+                    <Setter Property="Margin" Value="8,0,8,8" />
+                </Style>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="DisplayAfter" Value="00:00:00.1" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="Template" Value="{StaticResource BusyIndicatorTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 0d3711535..bfd00275c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
index effa98f0d..ddc7dbfa1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls.Primitives;
@@ -219,6 +219,50 @@ protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
       }
     }
 
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Up:
+          {
+            if( this.AllowSpin )
+            {
+              this.OnSpin( new SpinEventArgs( SpinDirection.Increase ) );
+            }
+            e.Handled = true;
+            break;
+          }
+        case Key.Down:
+          {
+            if( this.AllowSpin )
+            {
+              this.OnSpin( new SpinEventArgs( SpinDirection.Decrease ) );
+            }
+            e.Handled = true;
+            break;
+          }
+      }
+    }
+
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      base.OnMouseWheel( e );
+
+      if( !e.Handled && this.AllowSpin )
+      {
+        if( e.Delta < 0 )
+        {
+          this.OnSpin( new SpinEventArgs( SpinDirection.Decrease, true ) );
+        }
+        else if( 0 < e.Delta )
+        {
+          this.OnSpin( new SpinEventArgs( SpinDirection.Increase, true ) );
+        }
+
+        e.Handled = true;
+      }
+    }
+
     /// <summary>
     /// Called when valid spin direction changed.
     /// </summary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
index fcc90d1ce..b9d009969 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
index 6b0000a09..fe94ec649 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
@@ -34,6 +34,15 @@ public SpinDirection Direction
       private set;
     }
 
+    /// <summary>
+    /// Get or set whheter the spin event originated from a mouse wheel event.
+    /// </summary>
+    public bool UsingMouseWheel
+    {
+      get;
+      private set;
+    }
+
     /// <summary>
     /// Initializes a new instance of the SpinEventArgs class.
     /// </summary>
@@ -43,5 +52,12 @@ public SpinEventArgs( SpinDirection direction )
     {
       Direction = direction;
     }
+
+    public SpinEventArgs( SpinDirection direction, bool usingMouseWheel )
+      : base()
+    {
+      Direction = direction;
+      UsingMouseWheel = usingMouseWheel;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
index d4ae42955..0f1c9647f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
index 4cedc4c2a..0a7aba235 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..a16663a64
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,94 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Glyphs.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+
+    <!-- =============================================================================== -->
+    <!-- ButtonSpinner                                                                   -->
+    <!-- =============================================================================== -->
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+    <Style TargetType="{x:Type local:ButtonSpinner}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="IsTabStop" Value="True" />
+        <Setter Property="Padding" Value="1" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+                    <Border x:Name="Border" SnapsToDevicePixels="True" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" >
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                            <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="*" />
+                                    <RowDefinition Height="*" />
+                                </Grid.RowDefinitions>
+
+                                <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                                <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                            </Grid>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                        </Trigger>
+                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
index cc44ed107..91d1fb130 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
index aa12b59d3..6100f6bf2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
index 286b41da2..d24c8e08d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..6a7fc8716
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,259 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+    </Style>
+
+    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Background" Value="Pink" />
+    </Style>
+
+    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Background" Value="#FFE8E8E8" />
+    </Style>
+
+
+    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+        <Grid>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+                <ColumnDefinition Width="3" />
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+                <RowDefinition Height="3" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:Calculator}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Calculator}">
+                    <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="0">
+                        <Grid Margin="10">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition Height="*" />
+                            </Grid.RowDefinitions>
+                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1">
+                                <StackPanel>
+                                    <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                                    <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </StackPanel>
+                            </Border>
+                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_Display" Property="Background" Value="Azure" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
index 5ec4ba52f..9d68cc033 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
index b31a6b03a..4c0d2e8ba 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -168,7 +168,21 @@ public override void OnApplyTemplate()
       if( _calculatorPopup != null )
         _calculatorPopup.Opened += CalculatorPopup_Opened;
 
+      if( _calculator != null )
+        _calculator.ValueChanged -= OnCalculatorValueChanged;
+
       _calculator = GetTemplateChild( PART_Calculator ) as Calculator;
+
+      if( _calculator != null )
+        _calculator.ValueChanged += OnCalculatorValueChanged;
+    }
+
+    private void OnCalculatorValueChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
+    {
+      if( IsValid( _calculator.Value ) )
+      {
+        this.Value = _calculator.Value;
+      }
     }
 
     #endregion //Base Class Overrides
@@ -203,7 +217,7 @@ private void OnKeyDown( object sender, KeyEventArgs e )
         if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
         {
           IsOpen = true;
-          // calculator will get focus in CalculatorPopup_Opened().
+          // Calculator will get focus in CalculatorPopup_Opened().
           e.Handled = true;
         }
       }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..0fbee30a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,163 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+									   RenderMouseOver="{TemplateBinding IsMouseOver}"
+									   RenderPressed="{TemplateBinding IsPressed}">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                        </chrome:ButtonChrome>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <!-- =============================================================================== -->
+    <!-- CalculatorUpDown                                                                -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:CalculatorUpDown}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+                    <Grid>
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+                            <local:ButtonSpinner x:Name="PART_Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                                <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                BorderThickness="0" 
+                                                Background="{TemplateBinding Background}"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                SelectAllOnGotFocus="{TemplateBinding SelectAllOnGotFocus}"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                            </local:ButtonSpinner>
+                            <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   Focusable="False"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                        </Grid>
+                        <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                <StackPanel>
+                                    <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
+                                </StackPanel>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
index 05e782479..eab4b3529 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -75,7 +75,7 @@
    </Style>
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <!-- =============================================================================== -->
@@ -145,8 +145,7 @@
                                              BorderThickness="0"
                                              DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
                                              Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
-                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}" />
                         </StackPanel>
                      </Border>
                   </Popup>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
index 340b01679..2af21811b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Linq;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..1651d90e4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,112 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ToggleButton}">
+                    <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                        </Grid>
+                    </chrome:ButtonChrome>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsChecked" Value="true">
+                            <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="false">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:CheckComboBox}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="Padding" Value="2" />
+        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                        </Grid.ColumnDefinitions>
+                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                            <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                                <Border x:Name="DropDownBorder" MaxHeight="{Binding MaxDropDownHeight,  RelativeSource={RelativeSource TemplatedParent}}"  BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                                    <ScrollViewer x:Name="DropDownScrollViewer">
+                                        <Grid >
+                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                            </Canvas>
+                                            <ItemsPresenter x:Name="PART_ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                        </Grid>
+                                    </ScrollViewer>
+                                </Border>
+                            </Grid>
+                        </Popup>
+
+                        <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                        <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" Focusable="False" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
index 884fcfbec..26d879442 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
index 50783e25a..3796b06da 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using Xceed.Wpf.Toolkit.Primitives;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..e8703bfcd
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,48 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <Style TargetType="{x:Type local:CheckListBox}">
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        </ScrollViewer>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index b47f97eb8..1c95f81c2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
index 3c8399a32..eee107a01 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -23,142 +23,44 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media;
 using System.Windows.Shapes;
 using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
+using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
-  [TemplatePart( Name = PART_DragWidget, Type = typeof( Border ) )]
-  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]
-  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]
-  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]
-  public class ChildWindow : ContentControl
+#pragma warning disable 0809
+#pragma warning disable 0618 
+
+  [TemplatePart( Name = PART_WindowRoot, Type = typeof( Grid ) )]  
+  [TemplatePart( Name = PART_Root, Type = typeof( Grid ) )]   
+  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
+  public class ChildWindow : WindowControl
   {
-    private const string PART_DragWidget = "PART_DragWidget";
-    private const string PART_CloseButton = "PART_CloseButton";
-    private const string PART_WindowRoot = "PART_WindowRoot";
-    private const string PART_Root = "PART_Root";
+    private const string PART_WindowRoot = "PART_WindowRoot";  
+    private const string PART_Root = "PART_Root";   
+    private const string PART_WindowControl = "PART_WindowControl";
+    private const int _horizontalOffset = 3;
+    private const int _verticalOffset = 3;
 
     #region Private Members
 
-    private Grid _root;
-    private TranslateTransform _moveTransform = new TranslateTransform();
-    private bool _startupPositionInitialized;
-    private bool _isMouseCaptured;
-    private Point _clickPoint;
-    private Point _oldPosition;
-    private Border _dragWidget;
-    private FrameworkElement _parentContainer;
-    private Rectangle _modalLayer = new Rectangle();
-    private Canvas _modalLayerPanel = new Canvas();
-
-    private const int _horizaontalOffset = 3;
-    private const int _verticalOffset = 3;
-
-    bool _ignorePropertyChanged;
+    private Grid _root; 
+    private TranslateTransform _moveTransform = new TranslateTransform();  
+    private bool _startupPositionInitialized;  
+    private FrameworkElement _parentContainer;  
+    private Rectangle _modalLayer = new Rectangle();  
+    private Canvas _modalLayerPanel = new Canvas();  
+    private Grid _windowRoot;  
+    private WindowControl _windowControl;
+    private bool _ignorePropertyChanged;
+    private bool _hasWindowContainer;  
 
     #endregion //Private Members
 
-    #region Properties
-
-    #region Internal Properties
-
-    internal Grid WindowRoot
-    {
-      get;
-      private set;
-    }
-    internal Thumb DragWidget
-    {
-      get;
-      private set;
-    }
-    internal Button MinimizeButton
-    {
-      get;
-      private set;
-    }
-    internal Button MaximizeButton
-    {
-      get;
-      private set;
-    }
-    internal Button CloseButton
-    {
-      get;
-      private set;
-    }
-
-    #endregion //Internal Properties
-
     #region Public Properties
 
-    #region Caption
-
-    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( object ), typeof( ChildWindow ), new UIPropertyMetadata( String.Empty ) );
-    public object Caption
-    {
-      get
-      {
-        return ( object )GetValue( CaptionProperty );
-      }
-      set
-      {
-        SetValue( CaptionProperty, value );
-      }
-    }
-
-    #endregion //Caption
-
-    #region CaptionForeground
-
-    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
-    public Brush CaptionForeground
-    {
-      get
-      {
-        return ( Brush )GetValue( CaptionForegroundProperty );
-      }
-      set
-      {
-        SetValue( CaptionForegroundProperty, value );
-      }
-    }
-
-    #endregion //CaptionForeground
-
-    #region CloseButtonStyle
-
-    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Style CloseButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CloseButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonStyleProperty, value );
-      }
-    }
-
-    #endregion //CloseButtonStyle
-
-    #region CloseButtonVisibility
-
-    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( ChildWindow ), new PropertyMetadata( Visibility.Visible ) );
-    public Visibility CloseButtonVisibility
-    {
-      get
-      {
-        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonVisibilityProperty, value );
-      }
-    }
-
-    #endregion //CloseButtonVisibility
-
     #region DialogResult
 
     private bool? _dialogResult;
@@ -181,7 +83,7 @@ public bool? DialogResult
         if( _dialogResult != value )
         {
           _dialogResult = value;
-          Close();
+          this.Close();
         }
       }
     }
@@ -259,55 +161,38 @@ private static void OnIsModalPropertyChanged( DependencyObject d, DependencyProp
         childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
 
+    internal event EventHandler<EventArgs> IsModalChanged;
+
     private void OnIsModalChanged( bool oldValue, bool newValue )
     {
-      if( newValue )
-      {
-        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
-        ShowModalLayer();
-      }
-      else
+      EventHandler<EventArgs> handler = IsModalChanged;
+      if( handler != null )
       {
-        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
-        HideModalLayer();
+        handler( this, EventArgs.Empty );
       }
-    }
 
-    #endregion //IsModal
-
-    #region Left
-
-    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ) ) );
-    public double Left
-    {
-      get
-      {
-        return ( double )GetValue( LeftProperty );
-      }
-      set
+      if( !_hasWindowContainer )
       {
-        SetValue( LeftProperty, value );
+        if( newValue )
+        {
+          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
+          ShowModalLayer();
+        }
+        else
+        {
+          KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
+          HideModalLayer();
+        }
       }
     }
 
-    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = obj as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    private void OnLeftPropertyChanged( double oldValue, double newValue )
-    {
-      Left = GetRestrictedLeft();
-      ProcessMove( newValue - oldValue, 0 );
-    }
-
-    #endregion //Left
+    #endregion //IsModal
 
-    #region OverlayBrush
+    #region OverlayBrush (Obsolete)
 
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public Brush OverlayBrush
     {
       get
@@ -327,6 +212,7 @@ private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropert
         childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
     {
       _modalLayer.Fill = newValue;
@@ -334,9 +220,11 @@ protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
 
     #endregion //OverlayBrush
 
-    #region OverlayOpacity
+    #region OverlayOpacity (Obsolete)
 
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
+    [Obsolete( "This property is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     public double OverlayOpacity
     {
       get
@@ -356,93 +244,13 @@ private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPrope
         childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.ModalBackgroundBrushProperty instead." )]
     protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
     {
       _modalLayer.Opacity = newValue;
     }
 
-    #endregion //OverlayOpacity
-
-    #region Top
-
-    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ) ) );
-    public double Top
-    {
-      get
-      {
-        return ( double )GetValue( TopProperty );
-      }
-      set
-      {
-        SetValue( TopProperty, value );
-      }
-    }
-
-    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
-    {
-      ChildWindow childWindow = obj as ChildWindow;
-      if( childWindow != null )
-        childWindow.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
-    }
-
-    private void OnTopPropertyChanged( double oldValue, double newValue )
-    {
-      Top = GetRestrictedTop();
-      ProcessMove( 0, newValue - oldValue );
-    }
-
-    #endregion //TopProperty
-
-    #region WindowBackground
-
-    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Brush WindowBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowBackgroundProperty, value );
-      }
-    }
-
-    #endregion //WindowBackground
-
-    #region WindowBorderBrush
-
-    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public Brush WindowBorderBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBorderBrushProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderBrushProperty, value );
-      }
-    }
-
-    #endregion //WindowBorderBrush
-
-    #region WindowOpacity
-
-    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( null ) );
-    public double WindowOpacity
-    {
-      get
-      {
-        return ( double )GetValue( WindowOpacityProperty );
-      }
-      set
-      {
-        SetValue( WindowOpacityProperty, value );
-      }
-    }
-
-    #endregion //WindowOpacity
+    #endregion //OverlayOpacity  
 
     #region WindowStartupLocation
 
@@ -512,8 +320,6 @@ protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, Windo
 
     #endregion //Public Properties
 
-    #endregion //Properties
-
     #region Constructors
 
     static ChildWindow()
@@ -525,8 +331,6 @@ public ChildWindow()
     {
       DesignerWindowState = Xceed.Wpf.Toolkit.WindowState.Open;
 
-      IsVisibleChanged += ChildWindow_IsVisibleChanged;
-
       _modalLayer.Fill = OverlayBrush;
       _modalLayer.Opacity = OverlayOpacity;
     }
@@ -535,73 +339,81 @@ public ChildWindow()
 
     #region Base Class Overrides
 
+    internal override bool AllowPublicIsActiveChange
+    {
+      get { return false; }
+    }
+
     public override void OnApplyTemplate()
     {
       base.OnApplyTemplate();
 
-      if( _dragWidget != null )
+      if( _windowControl != null )
       {
-        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ) );
-        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ) );
-        _dragWidget.MouseMove -= ( o, e ) => HeaderMouseMove( e );
+        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClick( e );
+        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
       }
-
-      _dragWidget = GetTemplateChild( PART_DragWidget ) as Border;
-
-      if( _dragWidget != null )
+      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
+      if( _windowControl != null )
       {
-        _dragWidget.AddHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ), true );
-        _dragWidget.AddHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ), true );
-        _dragWidget.MouseMove += ( o, e ) => HeaderMouseMove( e );
+        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClick( e );
+        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
       }
 
-      if( CloseButton != null )
-        CloseButton.Click -= ( o, e ) => Close();
-
-      CloseButton = GetTemplateChild( PART_CloseButton ) as Button;
-
-      if( CloseButton != null )
-        CloseButton.Click += ( o, e ) => Close();
+      this.UpdateBlockMouseInputsPanel();
 
-      WindowRoot = GetTemplateChild( PART_WindowRoot ) as Grid;
-      WindowRoot.RenderTransform = _moveTransform;
+      _windowRoot = this.GetTemplateChild( PART_WindowRoot ) as Grid;
+      _windowRoot.RenderTransform = _moveTransform;
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
 
-      _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
-      _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
-      _parentContainer.SizeChanged += ParentContainer_SizeChanged;
-
-      //initialize our modal background width/height
-      _modalLayer.Height = _parentContainer.ActualHeight;
-      _modalLayer.Width = _parentContainer.ActualWidth;
-
-      //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
-      //we need to handle the loaded event and reposition the window.
-      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      if( !_hasWindowContainer )
       {
-        _parentContainer.Loaded += ( o, e ) =>
+        _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
+        if( _parentContainer != null )
+        {
+          _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
+          _parentContainer.SizeChanged += ParentContainer_SizeChanged;
+
+          //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+          //we need to handle the loaded event and reposition the window.
+          if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+          {
+            _parentContainer.Loaded += ( o, e ) =>
             {
               ExecuteOpen();
             };
-      }
+          }
+        }
 
-      _root = GetTemplateChild( PART_Root ) as Grid;
+        this.Unloaded += new RoutedEventHandler( ChildWindow_Unloaded );
+
+        //initialize our modal background width/height
+        _modalLayer.Height = _parentContainer.ActualHeight;
+        _modalLayer.Width = _parentContainer.ActualWidth;
+
+        _root = this.GetTemplateChild( PART_Root ) as Grid;
 
 #if VS2008
       FocusVisualStyle = null;
 #else
-      Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
-      if( focusStyle != null )
-      {
-        Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
-        focusStyle.Setters.Add( focusStyleDataContext );
-        FocusVisualStyle = focusStyle;
-      }
+        Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
+        if( focusStyle != null )
+        {
+          Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
+          focusStyle.Setters.Add( focusStyleDataContext );
+          FocusVisualStyle = focusStyle;
+        }
 #endif
-      _root.Children.Add( _modalLayerPanel );
+        _root.Children.Add( _modalLayerPanel );
+      }
     }
 
     protected override void OnGotFocus( RoutedEventArgs e )
     {
+      base.OnGotFocus( e );
+
       Action action = () =>
       {
         if( FocusedElement != null )
@@ -620,12 +432,12 @@ protected override void OnKeyDown( KeyEventArgs e )
         switch( e.Key )
         {
           case Key.Left:
-            this.Left -= _horizaontalOffset;
+            this.Left -= _horizontalOffset;
             e.Handled = true;
             break;
 
           case Key.Right:
-            this.Left += _horizaontalOffset;
+            this.Left += _horizontalOffset;
             e.Handled = true;
             break;
 
@@ -642,54 +454,118 @@ protected override void OnKeyDown( KeyEventArgs e )
       }
     }
 
-    #endregion //Base Class Overrides
+    protected override void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      base.OnLeftPropertyChanged( oldValue, newValue );
 
-    #region Event Handlers
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
+      if( !_hasWindowContainer )
+      {
+          Left = GetRestrictedLeft();
+        ProcessMove( newValue - oldValue, 0 );
+      }
+    }
 
-    void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    protected override void OnTopPropertyChanged( double oldValue, double newValue )
     {
-      if( ( bool )e.NewValue )
-        Focus();
+      base.OnTopPropertyChanged( oldValue, newValue );
+
+      _hasWindowContainer = ( VisualTreeHelper.GetParent( this ) as WindowContainer ) != null;
+      if( !_hasWindowContainer )
+      {
+          Top = GetRestrictedTop();
+        ProcessMove( 0, newValue - oldValue );
+      }
     }
 
-    void HeaderLeftMouseButtonDown( object sender, MouseButtonEventArgs e )
+    internal override void UpdateBlockMouseInputsPanel()
     {
-      e.Handled = true;
-      Focus();
-      _dragWidget.CaptureMouse();
-      _isMouseCaptured = true;
-      _clickPoint = e.GetPosition( null ); //save off the mouse position
-      _oldPosition = new Point( Left, Top ); //save off our original window position
+      if( _windowControl != null )
+      {
+        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
+      }
     }
 
-    private void HeaderMouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    #endregion //Base Class Overrides
+
+    #region Event Handlers
+
+    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
     {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
       e.Handled = true;
-      _dragWidget.ReleaseMouseCapture();
-      _isMouseCaptured = false;
+
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        if( object.Equals( e.OriginalSource, _windowControl ) )
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == FlowDirection.RightToLeft )
+            left = this.Left - e.HorizontalChange;
+          else
+            left = this.Left + e.HorizontalChange;
+
+          this.Left = left;
+          this.Top += e.VerticalChange;
+        }
+      }
     }
 
-    private void HeaderMouseMove( MouseEventArgs e )
+    protected virtual void OnHeaderIconDoubleClick( MouseButtonEventArgs e )
     {
-      if( _isMouseCaptured && Visibility == Visibility.Visible )
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
+
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = HeaderIconDoubleClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
       {
-        Point currentPosition = e.GetPosition( null ); //our current mouse position
+        this.Close();
+      }
+    }
 
-        Left = _oldPosition.X + ( currentPosition.X - _clickPoint.X );
-        Top = _oldPosition.Y + ( currentPosition.Y - _clickPoint.Y );
+    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
 
-        //this helps keep our mouse position in sync with the drag widget position
-        Point dragWidgetPosition = e.GetPosition( _dragWidget );
-        if( dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight )
-        {
-          return;
-        }
+      e.Handled = true;
 
-        _oldPosition = new Point( Left, Top );
-        _clickPoint = e.GetPosition( Window.GetWindow( this ) ); //store the point where we are relative to the window
+      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
       }
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
     {
       if( DesignerProperties.GetIsInDesignMode( this ) )
@@ -703,6 +579,27 @@ private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
+    private void ChildWindow_Unloaded( object sender, RoutedEventArgs e )
+    {
+      if( _parentContainer != null )
+      {
+        _parentContainer.LayoutUpdated -= ParentContainer_LayoutUpdated;
+        _parentContainer.SizeChanged -= ParentContainer_SizeChanged;        
+
+        //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+        //we need to handle the loaded event and reposition the window.
+        if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+        {
+          _parentContainer.Loaded -= ( o, ev ) =>
+          {
+            ExecuteOpen();
+          };
+        }
+      }
+    }
+
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
     {
       //resize our modal layer
@@ -714,12 +611,17 @@ void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
       Top = GetRestrictedTop();
     }
 
+
+
     #endregion //Event Handlers
 
     #region Methods
 
     #region Private
 
+
+
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedLeft() instead." )]
     private double GetRestrictedLeft()
     {
       if( Left < 0 )
@@ -727,9 +629,9 @@ private double GetRestrictedLeft()
 
       if( _parentContainer != null )
       {
-        if( Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
+        if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
         {
-          double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
+          double left = _parentContainer.ActualWidth - _windowRoot.ActualWidth;
           return left < 0 ? 0 : left;
         }
       }
@@ -737,6 +639,7 @@ private double GetRestrictedLeft()
       return Left;
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.GetRestrictedTop() instead." )]
     private double GetRestrictedTop()
     {
       if( Top < 0 )
@@ -744,9 +647,9 @@ private double GetRestrictedTop()
 
       if( _parentContainer != null )
       {
-        if( Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
+        if( Top + _windowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
         {
-          double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
+          double top = _parentContainer.ActualHeight - _windowRoot.ActualHeight;
           return top < 0 ? 0 : top;
         }
       }
@@ -802,12 +705,20 @@ private void ExecuteOpen()
     {
       _dialogResult = null; //reset the dialogResult to null each time the window is opened
 
-      if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
-        CenterChildWindow();
+      if( !_hasWindowContainer )
+        if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
+          CenterChildWindow(); 
 
-      BringToFront();
+      if( !_hasWindowContainer )
+        BringToFront();
     }
 
+    private bool IsCurrentWindow( object windowtoTest )
+    {
+      return object.Equals( _windowControl, windowtoTest );
+    }
+
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.BringToFront() instead." )]
     private void BringToFront()
     {
       int index = 0;
@@ -821,15 +732,17 @@ private void BringToFront()
         Canvas.SetZIndex( _modalLayerPanel, index - 2 );
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use WindowContainer.CenterChild() instead." )]
     private void CenterChildWindow()
     {
       if( _parentContainer != null )
       {
-        Left = ( _parentContainer.ActualWidth - WindowRoot.ActualWidth ) / 2.0;
-        Top = ( _parentContainer.ActualHeight - WindowRoot.ActualHeight ) / 2.0;
+        Left = ( _parentContainer.ActualWidth - _windowRoot.ActualWidth ) / 2.0;
+        Top = ( _parentContainer.ActualHeight - _windowRoot.ActualHeight ) / 2.0;
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void ShowModalLayer()
     {
       if( !DesignerProperties.GetIsInDesignMode( this ) )
@@ -841,11 +754,13 @@ private void ShowModalLayer()
       }
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used." )]
     private void HideModalLayer()
     {
       _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
     }
 
+    [Obsolete( "This method is obsolete and should no longer be used. Use the ChildWindow in a WindowContainer instead." )]
     private void ProcessMove( double x, double y )
     {
       _moveTransform.X += x;
@@ -895,5 +810,9 @@ protected virtual void OnClosing( CancelEventArgs e )
     }
 
     #endregion //Events
+
   }
+
+#pragma warning restore 0809
+#pragma warning restore 0618
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
index 5470079c4..690c92328 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
index 027fd2a05..072097080 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..0df15cc20
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,108 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+        <ResourceDictionary Source="../../Core/Themes/Aero2/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <SolidColorBrush x:Key="BorderBrush" Color="Orange" />
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ChildWindow                                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="MinWidth" Value="120" />
+        <Setter Property="MinHeight" Value="45" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+                    <Grid x:Name="PART_Root">
+                        <!-- Used For modal layer Deprecated-->
+                        <Grid.Resources>
+                            <!-- Used For KeyboardFocus Deprecated-->
+                            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                            <Style x:Key="FocusVisualStyle" TargetType="Control">
+                                <Setter Property="BorderBrush" Value="Black" />
+                                <Setter Property="Background" Value="Transparent" />
+                                <Setter Property="Margin" Value="-1" />
+                                <Setter Property="Template">
+                                    <Setter.Value>
+                                        <ControlTemplate>
+                                            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                                <Rectangle.RenderTransform>
+                                                    <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
+                                                </Rectangle.RenderTransform>
+                                            </Rectangle>
+                                        </ControlTemplate>
+                                    </Setter.Value>
+                                </Setter>
+                            </Style>
+                        </Grid.Resources>
+
+                        <!-- Used for drag -->
+                        <Grid x:Name="PART_WindowRoot"
+                          HorizontalAlignment="Left" 
+                          VerticalAlignment="Top" 
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}" 
+                          Width="{TemplateBinding Width}" 
+                          Height="{TemplateBinding Height}">
+
+                            <prim:WindowControl x:Name="PART_WindowControl" 
+                                            Caption="{TemplateBinding Caption}" 
+                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
+                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
+                                            CaptionIcon="{TemplateBinding CaptionIcon}"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                            BorderThickness="{TemplateBinding BorderThickness}" 
+                                            IsActive="{TemplateBinding IsActive}"
+                                            WindowBackground="{TemplateBinding WindowBackground}" 
+                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
+                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
+                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
+                                            Content="{TemplateBinding Content}"
+                                            WindowStyle="{TemplateBinding WindowStyle}"
+                                            Width="{TemplateBinding Width}"
+                                            Height="{TemplateBinding Height}">
+                            </prim:WindowControl>
+                        </Grid>
+                    </Grid>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="WindowState" Value="Closed">
+                            <Setter Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
index 05bdbf1c5..39825ca78 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
@@ -1,141 +1,44 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
-
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+       <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
+       <ResourceDictionary Source="../../Core/Themes/Generic/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
 
    <!-- =============================================================================== -->
    <!-- ChildWindow                                                                      -->
    <!-- =============================================================================== -->
 
-   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
-   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
-      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
-      <GradientStop Color="#00FFFFFF" Offset="1" />
-   </LinearGradientBrush>
-
-   <Style TargetType="{x:Type local:ChildWindow}">
-      <Setter Property="Background" Value="#FFFFFFFF" />
-      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CaptionForeground" Value="#FF000000" />
-      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="IsTabStop" Value="False" />
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="VerticalContentAlignment" Value="Top" />
-      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-      <Setter Property="WindowOpacity" Value="1.0" />
+   <Style TargetType="{x:Type local:ChildWindow}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+      <Setter Property="MinWidth" Value="140" />
+      <Setter Property="MinHeight" Value="40" />
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-               <Grid x:Name="PART_Root">
-                  <Grid.Resources>
-                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                <Grid x:Name="PART_Root"> <!-- Used For modal layer Deprecated-->
+                    <Grid.Resources>  <!-- Used For KeyboardFocus Deprecated-->
                      <Style x:Key="FocusVisualStyle" TargetType="Control">
                         <Setter Property="BorderBrush" Value="Black" />
                         <Setter Property="Background" Value="Transparent" />
@@ -145,90 +48,53 @@
                               <ControlTemplate>
                                  <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
                                     <Rectangle.RenderTransform>
-                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                       <TranslateTransform x:Name="_translateTransform" X="{Binding Left}" Y="{Binding Top}" />
                                     </Rectangle.RenderTransform>
                                  </Rectangle>
                               </ControlTemplate>
                            </Setter.Value>
                         </Setter>
                      </Style>
-                  </Grid.Resources>
-
-                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
-                     <Grid.RenderTransform>
-                        <TransformGroup>
-                           <ScaleTransform />
-                           <SkewTransform />
-                           <RotateTransform />
-                           <TranslateTransform />
-                        </TransformGroup>
-                     </Grid.RenderTransform>
-
-                     <!-- Borders -->
-                     <Grid  x:Name="WindowGrid">
-                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
-                        <Grid Margin="0" Background="{x:Null}">
-                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
-                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
-                        </Grid>
-                     </Grid>
-
-                     <Grid>
-                        <Grid.RowDefinitions>
-                           <RowDefinition Height="Auto" MinHeight="26" />
-                           <RowDefinition />
-                        </Grid.RowDefinitions>
-
-                        <!-- Content Border -->
-                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                           <Grid.RowDefinitions>
-                              <RowDefinition />
-                              <RowDefinition Height="Auto" />
-                           </Grid.RowDefinitions>
-                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
-                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-                              <ContentPresenter x:Name="Content"
-                                                Content="{TemplateBinding Content}" 
-                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
-                           </Border>
-                        </Grid>
-
-                        <!-- Header -->
-                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                           <Grid>
-                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
-                                 <!-- Caption -->
-                                 <ContentControl x:Name="Caption"
-                                                 Margin="5,0,0,0"
-                                                 IsTabStop="False"
-                                                 HorizontalAlignment="Stretch"
-                                                 Content="{TemplateBinding Caption}"
-                                                 Foreground="{TemplateBinding CaptionForeground}" />
-                              </Grid>
-                           </Grid>
-                        </Border>
-                     </Grid>
-
-                     <!-- Buttons -->
-                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
-                           <Path Height="10"
-                                 HorizontalAlignment="Center"
-                                 VerticalAlignment="Center"
-                                 Width="12"
-                                 Fill="#E4FFFFFF"
-                                 Stretch="Fill"
-                                 Stroke="#FF535666" 
-                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
-                        </Button>
-                     </Border>
-                  </Grid>
-               </Grid>
+                  </Grid.Resources> 
+
+                    <!-- Used for drag -->
+                    <Grid x:Name="PART_WindowRoot"
+                          HorizontalAlignment="Left" 
+                          VerticalAlignment="Top" 
+                          MinWidth="{TemplateBinding MinWidth}"
+                          MinHeight="{TemplateBinding MinHeight}" 
+                          Width="{TemplateBinding Width}" 
+                          Height="{TemplateBinding Height}">
+
+                        <prim:WindowControl x:Name="PART_WindowControl" 
+                                            Caption="{TemplateBinding Caption}" 
+                                            CaptionForeground="{TemplateBinding CaptionForeground}" 
+                                            CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}" 
+                                            CaptionIcon="{TemplateBinding CaptionIcon}"
+                                            Background="{TemplateBinding Background}"
+                                            BorderBrush="{TemplateBinding BorderBrush}" 
+                                            BorderThickness="{TemplateBinding BorderThickness}" 
+                                            IsActive="{TemplateBinding IsActive}"
+                                            WindowBackground="{TemplateBinding WindowBackground}" 
+                                            WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                            WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                            WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                            CloseButtonVisibility="{TemplateBinding CloseButtonVisibility}"
+                                            CloseButtonStyle="{TemplateBinding CloseButtonStyle}" 
+                                            WindowOpacity="{TemplateBinding WindowOpacity}" 
+                                            Content="{TemplateBinding Content}"
+                                            WindowStyle="{TemplateBinding WindowStyle}"
+                                            Width="{TemplateBinding Width}"
+                                            Height="{TemplateBinding Height}">
+                        </prim:WindowControl>
+                    </Grid>
+                </Grid>
+
                <ControlTemplate.Triggers>
                   <Trigger Property="WindowState" Value="Closed">
                      <Setter Property="Visibility" Value="Collapsed" />
                   </Trigger>
-               </ControlTemplate.Triggers>
+                </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
index 778219bee..89c66d096 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c1e522349
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,124 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+
+    <!-- =============================================================================== -->
+    <!-- ButtonChrome                                                                    -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type chrome:ButtonChrome}">
+        <Setter Property="CornerRadius" Value="0" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="SnapsToDevicePixels" Value="True" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+                    <Grid>
+
+                        <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" />
+
+                        <ContentPresenter Margin="{TemplateBinding Padding}"
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+
+                        <!-- If button is disabled, not checked, and is rendered normal -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="False" />
+                                <Condition Property="RenderChecked" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled and pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderPressed" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderChecked" Value="False" />
+                                <Condition Property="RenderMouseOver" Value="True" />
+                                <Condition Property="RenderPressed" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is enabled, checked, the mouse is not over, and it is not pressed -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderChecked" Value="True" />
+                                <Condition Property="RenderMouseOver" Value="False" />
+                                <Condition Property="RenderPressed" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderFocused" Value="True" />
+                                <Condition Property="RenderEnabled" Value="True" />
+                                <Condition Property="RenderPressed" Value="False" />
+                                <Condition Property="RenderMouseOver" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}" />
+                        </MultiTrigger>
+
+                        <!-- if not rendered normally -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="RenderNormal" Value="False" />
+                                <Condition Property="RenderChecked" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
+                            <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
+                        </MultiTrigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
index e9655483d..2ee81a1a2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
index 3b414ba40..f3ff8e305 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -26,10 +26,38 @@ This program is provided to you under the terms of the Microsoft Public
 
 namespace Xceed.Wpf.Toolkit
 {
+  [TemplatePart( Name = PART_NewItemTypesComboBox, Type = typeof( ComboBox ) )]
   public class CollectionControl : Control
   {
+    private const string PART_NewItemTypesComboBox = "PART_NewItemTypesComboBox";
+
+    #region Private Members
+
+    private ComboBox _newItemTypesComboBox;
+
+    #endregion
+
     #region Properties
 
+    #region IsReadOnly Property
+
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControl ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
+    #endregion  //Items
+
+    #region Items Property
+
     public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public ObservableCollection<object> Items
     {
@@ -43,6 +71,10 @@ public ObservableCollection<object> Items
       }
     }
 
+    #endregion  //Items
+
+    #region ItemsSource Property
+
     public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
     public IList ItemsSource
     {
@@ -72,7 +104,11 @@ public void OnItemSourceChanged( IList oldValue, IList newValue )
       }
     }
 
-    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null, new PropertyChangedCallback( ItemsSourceTypeChanged ) ) );
+    #endregion  //ItemsSource
+
+    #region ItemsSourceType Property
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemsSourceType
     {
       get
@@ -85,25 +121,9 @@ public Type ItemsSourceType
       }
     }
 
-    private static void ItemsSourceTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      CollectionControl CollectionControl = ( CollectionControl )d;
-      if( CollectionControl != null )
-        CollectionControl.ItemsSourceTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
-    }
+    #endregion //ItemsSourceType
 
-    protected virtual void ItemsSourceTypeChanged( Type oldValue, Type newValue )
-    {
-      List<Type> types = new List<Type>();
-      Type listType = GetListItemType( newValue );
-
-      if( listType != null )
-      {
-        types.Add( listType );
-      }
-
-      NewItemTypes = types;
-    }
+    #region NewItemType Property
 
     public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public IList<Type> NewItemTypes
@@ -118,6 +138,10 @@ public IList<Type> NewItemTypes
       }
     }
 
+    #endregion  //NewItemType
+
+    #region SelectedItem Property
+
     public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionControl ), new UIPropertyMetadata( null ) );
     public object SelectedItem
     {
@@ -131,8 +155,27 @@ public object SelectedItem
       }
     }
 
+    #endregion  //SelectedItem
+
     #endregion //Properties
 
+    #region Override Methods
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.Loaded -= new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
+
+      _newItemTypesComboBox = GetTemplateChild( PART_NewItemTypesComboBox ) as ComboBox;
+
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.Loaded += new RoutedEventHandler( this.NewItemTypesComboBox_Loaded );
+    }
+
+    #endregion
+
     #region Constructors
 
     static CollectionControl()
@@ -151,30 +194,137 @@ public CollectionControl()
 
     #endregion //Constructors
 
+    #region Events
+
+    #region ItemDeleting Event
+
+    public delegate void ItemDeletingRoutedEventHandler( object sender, ItemDeletingEventArgs e );
+
+    public static readonly RoutedEvent ItemDeletingEvent = EventManager.RegisterRoutedEvent( "ItemDeleting", RoutingStrategy.Bubble, typeof( ItemDeletingRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemDeletingRoutedEventHandler ItemDeleting
+    {
+      add
+      {
+        AddHandler( ItemDeletingEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemDeletingEvent, value );
+      }
+    }
+
+    #endregion //ItemDeleting Event
+
+    #region ItemDeleted Event
+
+    public delegate void ItemDeletedRoutedEventHandler( object sender, ItemEventArgs e );
+
+    public static readonly RoutedEvent ItemDeletedEvent = EventManager.RegisterRoutedEvent( "ItemDeleted", RoutingStrategy.Bubble, typeof( ItemDeletedRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemDeletedRoutedEventHandler ItemDeleted
+    {
+      add
+      {
+        AddHandler( ItemDeletedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemDeletedEvent, value );
+      }
+    }
+
+    #endregion //ItemDeleted Event
+
+    #region ItemAdding Event
+
+    public delegate void ItemAddingRoutedEventHandler( object sender, ItemAddingEventArgs e );
+
+    public static readonly RoutedEvent ItemAddingEvent = EventManager.RegisterRoutedEvent( "ItemAdding", RoutingStrategy.Bubble, typeof( ItemAddingRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemAddingRoutedEventHandler ItemAdding
+    {
+      add
+      {
+        AddHandler( ItemAddingEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemAddingEvent, value );
+      }
+    }
+
+    #endregion //ItemAdding Event
+
+    #region ItemAdded Event
+
+    public delegate void ItemAddedRoutedEventHandler( object sender, ItemEventArgs e );
+
+    public static readonly RoutedEvent ItemAddedEvent = EventManager.RegisterRoutedEvent( "ItemAdded", RoutingStrategy.Bubble, typeof( ItemAddedRoutedEventHandler ), typeof( CollectionControl ) );
+    public event ItemAddedRoutedEventHandler ItemAdded
+    {
+      add
+      {
+        AddHandler( ItemAddedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ItemAddedEvent, value );
+      }
+    }
+
+    #endregion //ItemAdded Event
+
+    #endregion
+
+    #region EventHandlers
+
+    void NewItemTypesComboBox_Loaded( object sender, RoutedEventArgs e )
+    {
+      if( _newItemTypesComboBox != null )
+        _newItemTypesComboBox.SelectedIndex = 0;
+    }
+
+    #endregion
+
     #region Commands
 
     private void AddNew( object sender, ExecutedRoutedEventArgs e )
     {
       var newItem = CreateNewItem( ( Type )e.Parameter );
+
+      var eventArgs = new ItemAddingEventArgs( ItemAddingEvent, newItem );
+      this.RaiseEvent( eventArgs );
+      if( eventArgs.Cancel )
+        return;
+      newItem = eventArgs.Item;
+
       Items.Add( newItem );
+
+      this.RaiseEvent( new ItemEventArgs( ItemAddedEvent, newItem ) );
+
       SelectedItem = newItem;
     }
 
     private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
     {
       Type t = e.Parameter as Type;
-      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null )
+      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null && !IsReadOnly)
         e.CanExecute = true;
     }
 
     private void Delete( object sender, ExecutedRoutedEventArgs e )
     {
+      var eventArgs = new ItemDeletingEventArgs( ItemDeletingEvent, e.Parameter );
+      this.RaiseEvent( eventArgs );
+      if( eventArgs.Cancel )
+        return;
+
       Items.Remove( e.Parameter );
+
+      this.RaiseEvent( new ItemEventArgs( ItemDeletedEvent, e.Parameter ) );
     }
 
     private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
     {
-      e.CanExecute = e.Parameter != null;
+      e.CanExecute = e.Parameter != null && !IsReadOnly;
     }
 
     private void MoveDown( object sender, ExecutedRoutedEventArgs e )
@@ -188,7 +338,7 @@ private void MoveDown( object sender, ExecutedRoutedEventArgs e )
 
     private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
     {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) )
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) && !IsReadOnly )
         e.CanExecute = true;
     }
 
@@ -203,7 +353,7 @@ private void MoveUp( object sender, ExecutedRoutedEventArgs e )
 
     private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
     {
-      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 )
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 && !IsReadOnly )
         e.CanExecute = true;
     }
 
@@ -213,10 +363,17 @@ private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
 
     private static void CopyValues( object source, object destination )
     {
-      FieldInfo[] myObjectFields = source.GetType().GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
-      foreach( FieldInfo fi in myObjectFields )
+      Type currentType = source.GetType();
+
+      while( currentType != null )
       {
-        fi.SetValue( destination, fi.GetValue( source ) );
+        FieldInfo[] myObjectFields = currentType.GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+        foreach( FieldInfo fi in myObjectFields )
+        {
+          fi.SetValue( destination, fi.GetValue( source ) );
+        }
+
+        currentType = currentType.BaseType;
       }
     }
 
@@ -249,16 +406,6 @@ private object CreateNewItem( Type type )
       return Activator.CreateInstance( type );
     }
 
-    internal static Type GetListItemType(Type listType)
-    {
-      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
-        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
-
-      return ( iListOfT != null )
-        ? iListOfT.GetGenericArguments()[ 0 ]
-        : null;
-    }
-
     public void PersistChanges()
     {
       IList list = ComputeItemsSource();
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
index 47d4088ce..76e3a6919 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <Window x:Class="Xceed.Wpf.Toolkit.CollectionControlDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -31,8 +31,9 @@
 
       <local:CollectionControl x:Name="_propertyGrid"
                               ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+                              ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Mode=TwoWay}"
+                              NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                              IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
 
       <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5">
          <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
index 9554a034e..7f5b90a21 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -67,6 +67,19 @@ public IList<Type> NewItemTypes
       }
     }
 
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( CollectionControlDialog ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+
     #endregion //Properties
 
     #region Constructors
@@ -76,10 +89,16 @@ public CollectionControlDialog()
       InitializeComponent();
     }
 
-    public CollectionControlDialog( Type type )
+    public CollectionControlDialog( Type itemsourceType )
       : this()
     {
-      ItemsSourceType = type;
+      ItemsSourceType = itemsourceType;
+    }
+
+    public CollectionControlDialog( Type itemsourceType, IList<Type> newItemTypes )
+      : this( itemsourceType )
+    {
+      NewItemTypes = newItemTypes;
     }
 
     #endregion //Constructors
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
new file mode 100644
index 000000000..d0ccf3e48
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
@@ -0,0 +1,74 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Converters
+{
+  /// <summary>
+  /// This multi-value converter is used in the CollectionControl template
+  /// to determine the list of possible new item types that will be shown in the combo box.
+  /// 
+  /// If the second value (i.e., CollectionControl.NewItemTypes) is not null, this list will be used.
+  /// Otherwise, if the first value (i.e., CollectionControl.ItemsSourceType) is a "IList&lt;T&gt;"
+  /// type, the new item type list will contain "T".
+  /// 
+  /// </summary>
+  public class NewItemTypesComboBoxConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+
+      if( values.Length != 2 )
+        throw new ArgumentException("The 'values' argument should contain 2 objects.");
+
+      if( values[ 1 ] != null )
+      {
+        if( !values[ 1 ].GetType().IsGenericType || !(values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type) )
+          throw new ArgumentException( "The 'value' argument is not of the correct type." );
+
+        return values[ 1 ];
+      }
+      else if( values[ 0 ] != null )
+      {
+        if( !( values[ 0 ].GetType() is Type ) )
+          throw new ArgumentException( "The 'value' argument is not of the correct type." );
+
+        List<Type> types = new List<Type>();
+        Type listType = ListUtilities.GetListItemType( ( Type )values[ 0 ] );
+        if( listType != null )
+        {
+          types.Add( listType );
+        }
+
+        return types;
+      }
+
+      return null;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
new file mode 100644
index 000000000..12d3bb479
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemAddingEventArgs : CancelRoutedEventArgs
+  {
+    #region Constructor
+
+    public ItemAddingEventArgs( RoutedEvent itemAddingEvent, object itemAdding )
+      : base( itemAddingEvent )
+    {
+      Item = itemAdding;
+    }
+
+    #endregion
+
+    #region Properties
+
+    #region Item Property
+
+    public object Item
+    {
+      get;
+      set;
+    }
+
+    #endregion
+
+    #endregion //Properties
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
new file mode 100644
index 000000000..d8343bdd6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
@@ -0,0 +1,56 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemDeletingEventArgs : CancelRoutedEventArgs
+  {
+    #region Private Members
+
+    private object _item;
+
+    #endregion
+
+    #region Constructor
+
+    public ItemDeletingEventArgs( RoutedEvent itemDeletingEvent, object itemDeleting )
+      : base( itemDeletingEvent )
+    {
+      _item = itemDeleting;
+    }
+
+    #region Property Item
+
+    public object Item
+    {
+      get
+      {
+        return _item;
+      }
+    }
+
+    #endregion
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
new file mode 100644
index 000000000..aa45304a6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
@@ -0,0 +1,55 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit
+{
+  public class ItemEventArgs : RoutedEventArgs
+  {
+    #region Protected Members
+
+    private object _item;
+
+    #endregion
+
+    #region Constructor
+
+    internal ItemEventArgs( RoutedEvent routedEvent, object newItem )
+      : base( routedEvent )
+    {
+      _item = newItem;
+    }
+
+    #endregion
+
+    #region Property Item
+
+    public object Item
+    {
+      get
+      {
+        return _item;
+      }
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
index 92b2a25ec..f35a248d5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -103,6 +103,21 @@ protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
 
     #endregion //ItemsSource
 
+    #region IsReadOnly
+
+    public static readonly DependencyProperty IsReadOnlyProperty =
+        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( false ) );
+
+    public bool IsReadOnly
+    {
+      get { return ( bool )GetValue( IsReadOnlyProperty ); }
+      set { SetValue( IsReadOnlyProperty, value ); }
+    }
+
+    #endregion //IsReadOnly
+
+    #region ItemsSourceType
+
     public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemsSourceType
     {
@@ -116,6 +131,10 @@ public Type ItemsSourceType
       }
     }
 
+    #endregion ItemsSourceType
+
+    #region ItemType
+
     public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null ) );
     public Type ItemType
     {
@@ -129,6 +148,8 @@ public Type ItemType
       }
     }
 
+    #endregion ItemType
+
     #region Text
 
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionControl ), new UIPropertyMetadata( null, OnTextChanged ) );
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..2ed475c49
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,173 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+    <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
+
+    <Style x:Key="CollectionControlButtonStyle" TargetType="{x:Type Button}">
+        <Style.Triggers>
+            <Trigger Property="IsEnabled" Value="false">
+                <Setter Property="Opacity" Value="0.6" />
+            </Trigger>
+        </Style.Triggers>
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Height" Value="26" />
+        <Setter Property="Width" Value="26" />
+    </Style>
+
+    <Style TargetType="{x:Type local:CollectionControl}">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:CollectionControl}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="1.5*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                                <ComboBox x:Name="PART_NewItemTypesComboBox"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  DisplayMemberPath="Name">
+                                    <ComboBox.ItemsSource>
+                                        <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
+                                            <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
+                                        </MultiBinding>
+                                    </ComboBox.ItemsSource>
+                                </ComboBox>
+                                <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
+                                <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                                    <ListBox.ItemTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                                        </DataTemplate>
+                                    </ListBox.ItemTemplate>
+                                </ListBox>
+                                <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                                    <Button Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Path Fill="#FF000000" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                                    </Button>
+                                    <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Path Fill="#FF000000" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                                    </Button>
+                                    <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionControlButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                                        <Image Stretch="None" Height="16" Width="16" Margin="1" Source="./../Images/Delete16.png" />
+                                    </Button>
+                                </StackPanel>
+                            </Grid>
+                            <Grid Column="1" Margin="20,0,0,0">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition />
+                                </Grid.RowDefinitions>
+                                <TextBlock Grid.Column="1" Text="Properties:" />
+                                <pg:PropertyGrid Grid.Row="1"
+                                         Grid.Column="1"
+                                         Margin="0,5,0,0"
+                                         HorizontalAlignment="Stretch"
+                                         VerticalAlignment="Stretch"
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                         IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </Grid>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionControl}">
+                    <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          IsReadOnly="{TemplateBinding IsReadOnly}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
index 86e83a01b..1a800b232 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
@@ -1,27 +1,29 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:colconv="clr-namespace:Xceed.Wpf.Toolkit.Converters"
                     xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
    <conv:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
+   <colconv:NewItemTypesComboBoxConverter x:Key="NewItemTypesComboBoxConverter" />
 
    <Style x:Key="CollectionControlButtonStyle" TargetType="{x:Type Button}">
       <Style.Triggers>
@@ -57,20 +59,25 @@
                            <RowDefinition />
                         </Grid.RowDefinitions>
                         <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                        <ComboBox x:Name="_newItemTypes"
+                        <ComboBox x:Name="PART_NewItemTypesComboBox"
                                   Grid.Row="1"
                                   Margin="0,0,0,3"
                                   HorizontalAlignment="Stretch"
-                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                  DisplayMemberPath="Name"
-                                  SelectedIndex="0" />
+                                  DisplayMemberPath="Name">
+                            <ComboBox.ItemsSource>
+                                <MultiBinding Converter="{StaticResource NewItemTypesComboBoxConverter}">
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="ItemsSourceType" />
+                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NewItemTypes" />
+                                </MultiBinding>
+                            </ComboBox.ItemsSource>
+                        </ComboBox>
                         <Button Margin="3,0,0,3"
                                 Grid.Row="1"
                                 Grid.Column="1"
                                 Padding="5,0"
                                 Content="Add" 
                                 Command="New"
-                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                                CommandParameter="{Binding SelectedItem, ElementName=PART_NewItemTypesComboBox}" />
                         <ListBox x:Name="_itemsListBox"
                                  Grid.Row="2"
                                  Grid.ColumnSpan="2"
@@ -99,7 +106,7 @@
                                    Style="{StaticResource CollectionControlButtonStyle}"
                                    Command="Delete"
                                    CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Images/Delete16.png" />
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="./../Images/Delete16.png" />
                            </Button>
                         </StackPanel>
                      </Grid>
@@ -114,7 +121,8 @@
                                          Margin="0,5,0,0"
                                          HorizontalAlignment="Stretch"
                                          VerticalAlignment="Stretch"
-                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                                         SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                         IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}" />
                      </Grid>
                   </Grid>
                </Border>
@@ -149,6 +157,7 @@
                                           Padding="{TemplateBinding Padding}"
                                           HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                           IsOpen="{TemplateBinding IsOpen}"
+                                          IsReadOnly="{TemplateBinding IsReadOnly}"
                                           Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
                                           VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
             </ControlTemplate>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
index b734f91fd..0417d9b77 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index d71035e19..fe4ba30df 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..1f916904e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,319 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvasTextBox (Style)                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+        <Setter Property="Background" Value="Transparent" />
+        <Style.Triggers>
+            <Trigger Property="IsFocused" Value="False">
+                <Setter Property="BorderBrush" Value="Transparent" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- SliderRepeatButton (Style)                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style x:Key="SliderRepeatButtonStyle" TargetType="{x:Type RepeatButton}">
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="IsTabStop" Value="false" />
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Border Background="{TemplateBinding Background}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- VerticalSlideThumb (Template and Style)                                         -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="VerticalSlideThumbTemplate" TargetType="{x:Type Thumb}">
+        <Canvas SnapsToDevicePixels="true">
+            <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform />
+                        <SkewTransform />
+                        <RotateTransform />
+                        <TranslateTransform Y="6" X="-3" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+            <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform />
+                        <SkewTransform />
+                        <RotateTransform Angle="-180" />
+                        <TranslateTransform Y="6" X="8" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+        </Canvas>
+    </ControlTemplate>
+
+    <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+        <Setter Property="Focusable" Value="false" />
+        <Setter Property="OverridesDefaultStyle" Value="true" />
+        <Setter Property="Height" Value="12" />
+        <Setter Property="Width" Value="11" />
+        <Setter Property="Foreground" Value="Gray" />
+        <Setter Property="Template" Value="{StaticResource VerticalSlideThumbTemplate}" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorSpectrumSlider (Template and Style)                                        -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="ColorSpectrumSliderTemplate" TargetType="{x:Type local:ColorSpectrumSlider}">
+        <Grid>
+            <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+            </Border>
+
+            <Track Name="PART_Track">
+                <Track.DecreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                </Track.DecreaseRepeatButton>
+                <Track.IncreaseRepeatButton>
+                    <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                </Track.IncreaseRepeatButton>
+                <Track.Thumb>
+                    <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                </Track.Thumb>
+            </Track>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+        <Setter Property="Orientation" Value="Vertical" />
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+        <Setter Property="Minimum" Value="1" />
+        <Setter Property="Maximum" Value="360" />
+        <Setter Property="TickFrequency" Value="0.001" />
+        <Setter Property="IsSnapToTickEnabled" Value="True" />
+        <Setter Property="IsDirectionReversed" Value="False" />
+        <Setter Property="IsMoveToPointEnabled" Value="True" />
+        <Setter Property="Value" Value="0" />
+        <Setter Property="Template" Value="{StaticResource ColorSpectrumSliderTemplate}" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvas (Template and Style)                                                -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="ColorCanvasTemplate" TargetType="{x:Type local:ColorCanvas}">
+        <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+            <Grid Margin="2">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid>
+                    <Grid.ColumnDefinitions >
+                        <ColumnDefinition Width="200" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                    </Grid.RowDefinitions>
+
+                    <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                        <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                            <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                            <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                        <GradientStop Offset="0" Color="#ffffffff" />
+                                        <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                        <GradientStop Offset="0" Color="#ff000000" />
+                                        <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                </Rectangle.Fill>
+                            </Rectangle>
+                            <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                            </Canvas>
+                        </Canvas>
+                    </Border>
+
+                    <Border Grid.Row="1" Margin="0,5,0,0">
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                            </Border>
+                            <TextBox x:Name="PART_HexadecimalTextBox" Grid.Column="1" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                        </Grid>
+                    </Border>
+
+                    <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                        <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                    </Border>
+                </Grid>
+
+                <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                        <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                        <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                        <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center"
+                                      Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   SmallChange="1"
+                                   LargeChange="10"
+                                   Margin="4,6,4,6"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center"
+                                   Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                        <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" 
+                                    Visibility="{Binding Path=UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
+                    </Grid>
+                </Border>
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:ColorCanvas}">
+        <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Template" Value="{StaticResource ColorCanvasTemplate}" />
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index 4200567bf..ac04ae9eb 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -1,24 +1,28 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
+   <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
@@ -38,26 +42,6 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
 
-   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-      <DrawingBrush.Drawing>
-         <DrawingGroup>
-            <GeometryDrawing Brush="White">
-               <GeometryDrawing.Geometry>
-                  <RectangleGeometry Rect="0,0 100,100" />
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-            <GeometryDrawing Brush="LightGray">
-               <GeometryDrawing.Geometry>
-                  <GeometryGroup>
-                     <RectangleGeometry Rect="0,0 50,50" />
-                     <RectangleGeometry Rect="50,50 50,50" />
-                  </GeometryGroup>
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-         </DrawingGroup>
-      </DrawingBrush.Drawing>
-   </DrawingBrush>
-
    <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
 
    <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
index b851ab0f7..c11af4ee7 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Media;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index 0a53b045c..a8422c7c9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..8709a7cf6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,291 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+        <Setter Property="ToolTip" Value="{Binding Name}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Grid ToolTip="{Binding Name}">
+                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                        <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                            <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <DataTemplate x:Key="ColorItemTemplate">
+        <Grid>
+            <Border Background="{StaticResource CheckerBrush}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" BorderThickness="1" Margin="2,2,2,2" >
+                <Rectangle Width="14" Height="14">
+                    <Rectangle.Style>
+                        <Style TargetType="Rectangle">
+                            <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                        </Style>
+                    </Rectangle.Style>
+                </Rectangle>
+            </Border>
+        </Grid>
+    </DataTemplate>
+
+    <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*"/>
+                                <ColumnDefinition Width="Auto"/>
+                            </Grid.ColumnDefinitions>
+
+                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                                <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                            </Border>
+
+                            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0"
+                                          Visibility="{Binding ShowDropDownButton, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+										  RenderMouseOver="{TemplateBinding IsMouseOver}"
+										  RenderPressed="{TemplateBinding IsPressed}">
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </chrome:ButtonChrome>
+                        </Grid>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+     <Style x:Key="ColorDisplayStyle" TargetType="ContentControl">
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <Border Background="{StaticResource CheckerBrush}">
+                  <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+               </Border>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+    <Style x:Key="ColorListStyle" TargetType="ListBox">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <WrapPanel Width="200" />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+        <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+        <Setter Property="SelectionMode" Value="Single" />
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorPicker                                                                     -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:ColorPicker}">
+        <Setter Property="Background" Value="White" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+                    <Grid>
+                        <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                            <Grid Margin="2">
+                                <ContentControl x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                                <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                                    <StackPanel Orientation="Horizontal">
+                                        <ContentControl HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+                                        <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                                    </StackPanel>
+                                </Border>
+                            </Grid>
+                        </ToggleButton>
+
+                        <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                <Grid>
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition Height="Auto" />
+                                        <RowDefinition />
+                                        <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+
+                                    <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                                        <Grid.RowDefinitions>
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                            <RowDefinition Height="Auto" />
+                                        </Grid.RowDefinitions>
+
+                                        <!-- Available Colors -->
+                                        <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                                <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+
+                                        <!-- Standard Colors-->
+                                        <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                                <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+
+                                        <!-- Recent Colors-->
+                                        <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                            <Grid>
+                                                <Grid.RowDefinitions>
+                                                    <RowDefinition Height="Auto" />
+                                                    <RowDefinition Height="Auto" />
+                                                </Grid.RowDefinitions>
+                                                <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                                <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                            </Grid>
+                                        </Grid>
+                                    </Grid>
+
+                                    <!-- ColorCanvas -->
+                                    <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                                        <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 UsingAlphaChannel="{Binding UsingAlphaChannel, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </Grid>
+
+                                    <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                                    <!-- More Colors Button -->
+                                    <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                                </Grid>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="DisplayColorAndName" Value="True">
+                            <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                            <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                            <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                            <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index 001916d26..3b506b199 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -20,6 +20,10 @@
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
 
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="..\..\Themes\Generic\Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
    <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
    <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
    <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
@@ -50,26 +54,6 @@
       </LinearGradientBrush.GradientStops>
    </LinearGradientBrush>
 
-   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-      <DrawingBrush.Drawing>
-         <DrawingGroup>
-            <GeometryDrawing Brush="White">
-               <GeometryDrawing.Geometry>
-                  <RectangleGeometry Rect="0,0 100,100" />
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-            <GeometryDrawing Brush="LightGray">
-               <GeometryDrawing.Geometry>
-                  <GeometryGroup>
-                     <RectangleGeometry Rect="0,0 50,50" />
-                     <RectangleGeometry Rect="50,50 50,50" />
-                  </GeometryGroup>
-               </GeometryDrawing.Geometry>
-            </GeometryDrawing>
-         </DrawingGroup>
-      </DrawingBrush.Drawing>
-   </DrawingBrush>
-
    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
       <Setter Property="ToolTip" Value="{Binding Name}" />
       <Setter Property="Template">
@@ -98,16 +82,11 @@
 
    <DataTemplate x:Key="ColorItemTemplate">
       <Grid>
-         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+         <Border Background="{StaticResource CheckerBrush}" BorderBrush="Black" BorderThickness="1" Margin="2,2,2,2" >
             <Rectangle Width="14" Height="14">
                <Rectangle.Style>
                   <Style TargetType="Rectangle">
                      <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                     <Style.Triggers>
-                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
-                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
-                        </DataTrigger>
-                     </Style.Triggers>
                   </Style>
                </Rectangle.Style>
             </Rectangle>
@@ -161,13 +140,16 @@
       </Setter>
    </Style>
 
-   <Style x:Key="ColorDisplayStyle" TargetType="Border">
-      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-      <Style.Triggers>
-         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
-            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
-         </DataTrigger>
-      </Style.Triggers>
+   <Style x:Key="ColorDisplayStyle" TargetType="ContentControl">
+      <Setter Property="ContentTemplate">
+         <Setter.Value>
+            <DataTemplate>
+               <Border Background="{StaticResource CheckerBrush}">
+                  <Rectangle Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+               </Border>
+            </DataTemplate>
+         </Setter.Value>
+      </Setter>
    </Style>
 
    <Style x:Key="ColorListStyle" TargetType="ListBox">
@@ -210,11 +192,11 @@
                                 IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
                                 Style="{TemplateBinding ButtonStyle}">
                      <Grid Margin="2">
-                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+                        <ContentControl x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
 
                         <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
                            <StackPanel Orientation="Horizontal">
-                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <ContentControl HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
                               <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
                            </StackPanel>
                         </Border>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
new file mode 100644
index 000000000..d58c61e50
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
@@ -0,0 +1,59 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  public delegate void CancelRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+  /// <summary>
+  /// An event data class that allows to inform the sender that the handler wants to cancel
+  /// the ongoing action.
+  /// 
+  /// The handler can set the "Cancel" property to false to cancel the action.
+  /// </summary>
+  public class CancelRoutedEventArgs : RoutedEventArgs
+  {
+    public CancelRoutedEventArgs()
+      : base()
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent )
+      : base( routedEvent )
+    {
+    }
+
+    public CancelRoutedEventArgs( RoutedEvent routedEvent, object source )
+      : base( routedEvent, source )
+    {
+    }
+
+    #region Cancel Property
+
+    public bool Cancel
+    {
+      get;
+      set;
+    }
+
+    #endregion Cancel Property
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
new file mode 100644
index 000000000..cda549e12
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class BorderThicknessToStrokeThicknessConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Thickness thickness = ( Thickness )value;
+      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int? thick = ( int? )value;
+      int thickValue = thick.HasValue ? thick.Value : 0;
+
+      return new Thickness( thickValue, thickValue, thickValue, thickValue );
+    }
+
+    #endregion
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
index c59a1a852..5d8ff3756 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
new file mode 100644
index 000000000..4b484a137
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -0,0 +1,82 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Windows.Data;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  /// <summary>
+  /// This converter allow to blend two colors into one based on a specified ratio
+  /// </summary>
+  public class ColorBlendConverter : IValueConverter
+  {
+    private double _blendedColorRatio = 0;
+
+    /// <summary>
+    /// The ratio of the blended color. Must be between 0 and 1.
+    /// </summary>
+    public double BlendedColorRatio
+    {
+      get { return _blendedColorRatio; }
+
+      set
+      {
+        if( value < 0d || value > 1d )
+          throw new ArgumentException( "BlendedColorRatio must greater than or equal to 0 and lower than or equal to 1 " );
+
+        _blendedColorRatio = value;
+      }
+    }
+
+    /// <summary>
+    /// The color to blend with the source color
+    /// </summary>
+    public Color BlendedColor { get; set; }
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null || value.GetType() != typeof( Color ) )
+        return null;
+
+      Color color = ( Color )value;
+      return new Color()
+      {
+        A = this.BlendValue( color.A, this.BlendedColor.A ),
+        R = this.BlendValue( color.R, this.BlendedColor.R ),
+        G = this.BlendValue( color.G, this.BlendedColor.G ),
+        B = this.BlendValue( color.B, this.BlendedColor.B )
+      };
+    }
+
+    private byte BlendValue( byte original, byte blend )
+    {
+      double blendRatio = this.BlendedColorRatio;
+      double sourceRatio = 1 - blendRatio;
+
+      double result = ( ( ( double )original ) * sourceRatio ) + ( ( ( double )blend ) * blendRatio );
+      result = Math.Round( result );
+      result = Math.Min( 255d, Math.Max( 0d, result ) );
+      return System.Convert.ToByte( result );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
index e69569a13..efe72b021 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
index b4df59852..56a6d0c2c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
index 5bf381051..7020084e3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
index 5a5359326..ed3c07f83 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
index e4bc5196e..8a62ec7f7 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
index 2eca58e8d..103512841 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
index 1e11e0470..e535f3b09 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
new file mode 100644
index 000000000..e09d4cffc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
@@ -0,0 +1,67 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  /// <summary>
+  /// Sets the margin for the thumb grip, the top buttons, or for the content border in the WindowControl.
+  /// </summary>
+  public class WindowContentBorderMarginConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+      double horizontalContentBorderOffset = ( double )values[ 0 ];
+      double verticalContentBorderOffset = ( double )values[ 1 ];
+
+      switch( ( string )parameter )
+      {
+        // Content Border Margin in the WindowControl
+        case "0":
+          return new Thickness( horizontalContentBorderOffset
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , verticalContentBorderOffset );
+        // Thumb Grip Margin in the WindowControl
+        case "1":
+          return new Thickness( 0d
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , verticalContentBorderOffset );
+        // Header Buttons Margin in the WindowControl
+        case "2":
+          return new Thickness( 0d
+                              , 0d
+                              , horizontalContentBorderOffset
+                              , 0d );
+        default:
+          throw new NotSupportedException( "'parameter' for WindowContentBorderMarginConverter is not valid." );
+      }
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
new file mode 100644
index 000000000..1135f2f3e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
@@ -0,0 +1,61 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Converters
+{
+  public class WindowControlBackgroundConverter : IMultiValueConverter
+  {
+    /// <summary>
+    /// Used in the WindowContainer Template to calculate the resulting background brush
+    /// from the WindowBackground (values[0]) and WindowOpacity (values[1]) propreties.
+    /// </summary>
+    /// <param name="values"></param>
+    /// <param name="targetType"></param>
+    /// <param name="parameter"></param>
+    /// <param name="culture"></param>
+    /// <returns></returns>
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
+    {
+      Brush backgroundColor = ( Brush )values[ 0 ];
+      double opacity = ( double )values[ 1 ];
+
+      if( backgroundColor != null )
+      {
+        // Do not override any possible opacity value specifically set by the user.
+        // Only use WindowOpacity value if the user did not set an opacity first.
+        if( backgroundColor.ReadLocalValue( Brush.OpacityProperty ) == System.Windows.DependencyProperty.UnsetValue )
+        {
+          backgroundColor = backgroundColor.Clone();
+          backgroundColor.Opacity = opacity;
+        }
+      }
+      return backgroundColor;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
index 05c21163b..bfec6ea89 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -24,7 +24,13 @@ public class WizardPageButtonVisibilityConverter : IMultiValueConverter
   {
     public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-      Visibility wizardVisibility = ( Visibility )values[ 0 ];
+      if( values == null || values.Length != 2 )
+        throw new ArgumentException( "Wrong number of arguments for WizardPageButtonVisibilityConverter." );
+
+      Visibility wizardVisibility = ( (values[ 0 ] == null) || (values[ 0 ] == DependencyProperty.UnsetValue) )
+                                    ? Visibility.Hidden
+                                    : ( Visibility )values[ 0 ];
+
       WizardPageButtonVisibility wizardPageVisibility = ( (values[ 1 ] == null) || (values[ 1 ] == DependencyProperty.UnsetValue) )
                                                         ? WizardPageButtonVisibility.Hidden
                                                         : ( WizardPageButtonVisibility )values[ 1 ];
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
index 2962f8f45..c44e86f96 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Resources;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
index 755fe58a5..7c3767260 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
index e158b51f2..9a81349f5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Core
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
index e3d7c975e..83d0562a0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
index 826e0a8e3..bc7c6151a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
index d667cfb14..0e82cf02c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 
 namespace Xceed.Wpf.Toolkit.Core.Input
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
index a8db6eb8d..e1c47a14a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
index d47039103..cec587da1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
index 376021464..793cb9e14 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
index 3cebbc7d3..97fc54bf8 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
index 729c67286..3ec7e7bad 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
index ec2a02e80..c8b9024f6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
index 6e6482df0..1cc8fcb12 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
index d6ce858c3..dbb3d684c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
index f4cf3c588..57f56b0ed 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
index b0bce853a..41c3a77a2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
index a7d3db9a0..4b7765a6e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
new file mode 100644
index 000000000..7a3f193e7
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
@@ -0,0 +1,126 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+
+namespace Xceed.Wpf.Toolkit.Core.Media
+{
+  /// <summary>
+  /// Contains system colors and configurations that can be used by the control themes.
+  /// 
+  /// Mainly extracted from the registry because theses values are not exposed by the standard .NET API.
+  /// </summary>
+  public static class WindowColors
+  {
+    private static Color? _colorizationMode;
+    private static bool? _colorizationOpaqueBlend;
+
+    /// <summary>
+    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationColor Registry key.
+    /// 
+    /// Gets the window chrome color.
+    /// </summary>
+    public static Color ColorizationColor
+    {
+      get
+      {
+        if( _colorizationMode.HasValue )
+          return _colorizationMode.Value;
+
+        try
+        {
+          _colorizationMode = WindowColors.GetDWMColorValue( "ColorizationColor" );
+        }
+        catch
+        {
+          // If for any reason (for example, a SecurityException for XBAP apps)
+          // we cannot read the value in the registry, fall back on some color.
+          _colorizationMode = Color.FromArgb(255, 175, 175, 175);
+        }
+
+        return _colorizationMode.Value;
+      }
+    }
+
+    /// <summary>
+    /// Relative to the \HKEY_CURRENT_USER\Software\Microsoft\Windows\DWM\ColorizationOpaqueBlend Registry key:
+    /// 
+    /// Gets whether transparency is disabled.
+    /// 
+    /// Returns true if transparency is disabled; false otherwise.
+    /// </summary>
+    public static bool ColorizationOpaqueBlend
+    {
+      get
+      {
+        if( _colorizationOpaqueBlend.HasValue )
+          return _colorizationOpaqueBlend.Value;
+
+        try
+        {
+          _colorizationOpaqueBlend = WindowColors.GetDWMBoolValue( "ColorizationOpaqueBlend" );
+        }
+        catch
+        {
+          // If for any reason (for example, a SecurityException for XBAP apps)
+          // we cannot read the value in the registry, fall back on some color.
+          _colorizationOpaqueBlend = false;
+        }
+
+        return _colorizationOpaqueBlend.Value;
+      }
+    }
+
+    private static int GetDWMIntValue( string keyName )
+    {
+      // This value is not accessible throught the standard WPF API.
+      // We must dig into the registry to get the value.
+      var curUser = Microsoft.Win32.Registry.CurrentUser;
+      var subKey = curUser.CreateSubKey(
+        @"Software\Microsoft\Windows\DWM",
+        Microsoft.Win32.RegistryKeyPermissionCheck.ReadSubTree
+#if VS2008
+        );
+#else
+        ,Microsoft.Win32.RegistryOptions.None );
+#endif
+      return ( int )subKey.GetValue( keyName );
+    }
+
+    private static Color GetDWMColorValue( string keyName )
+    {
+      int value = WindowColors.GetDWMIntValue( keyName );
+        byte[] bytes = BitConverter.GetBytes( value );
+        return new Color()
+        {
+          B = bytes[ 0 ],
+          G = bytes[ 1 ],
+          R = bytes[ 2 ],
+          A = 255
+        };
+    }
+
+    private static bool GetDWMBoolValue( string keyName )
+    {
+      int value = WindowColors.GetDWMIntValue( keyName );
+      return ( value != 0 );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
index b0e6495d5..d72aaa879 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/CachedTextInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
index 5952a6a39..e65f57fb2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/HsvColor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
index 55efca55f..d8d3e00d6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/InputBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs
new file mode 100644
index 000000000..29d012caf
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/MouseWheelActiveTriggerEnum.cs
@@ -0,0 +1,33 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  /// <summary>
+  /// Specify when the mouse wheel is active.
+  /// </summary>
+  public enum MouseWheelActiveTrigger
+  {
+    Focused,
+    MouseOver,
+    Disabled
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
index b0afdbba4..6aaa50da2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/Selector.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -682,6 +682,7 @@ public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
         else if( object.ReferenceEquals( ItemsCollection, sender ) )
         {
           this.OnItemsSourceCollectionChanged( sender, ( NotifyCollectionChangedEventArgs )e );
+          return true;
         }
       }
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
index b3c4c7ee2..117ad4547 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/SelectorItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
index 18ab741a6..ccddcb5ea 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ShapeBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Diagnostics;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
index 23213fc17..12c4ef285 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/UpDownBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -109,21 +109,62 @@ private void OnDefaultValueChanged( T oldValue, T newValue )
 
     #endregion //DefaultValue
 
+    #region MouseWheelActiveTrigger
+
+    /// <summary>
+    /// Identifies the MouseWheelActiveTrigger dependency property
+    /// </summary>
+    public static readonly DependencyProperty MouseWheelActiveTriggerProperty = DependencyProperty.Register( "MouseWheelActiveTrigger", typeof( MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( MouseWheelActiveTrigger.Focused ) );
+
+    /// <summary>
+    /// Get or set when the mouse wheel event should affect the value.
+    /// </summary>
+    public MouseWheelActiveTrigger MouseWheelActiveTrigger
+    {
+      get
+      {
+        return ( MouseWheelActiveTrigger )GetValue( MouseWheelActiveTriggerProperty );
+      }
+      set
+      {
+        SetValue( MouseWheelActiveTriggerProperty, value );
+      }
+    }
+
+    #endregion //MouseWheelActiveTrigger
+
+
     #region MouseWheelActiveOnFocus
 
-    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    [Obsolete("Use MouseWheelActiveTrigger property instead")]
+    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true, OnMouseWheelActiveOnFocusChanged ) );
+
+    [Obsolete( "Use MouseWheelActiveTrigger property instead" )]
     public bool MouseWheelActiveOnFocus
     {
       get
       {
+#pragma warning disable 618
         return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
+#pragma warning restore 618
       }
       set
       {
+#pragma warning disable 618
         SetValue( MouseWheelActiveOnFocusProperty, value );
+#pragma warning restore 618
       }
     }
 
+    private static void OnMouseWheelActiveOnFocusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      UpDownBase<T> upDownBase = o as UpDownBase<T>;
+      if( upDownBase != null )
+        upDownBase.MouseWheelActiveTrigger = (( bool )e.NewValue) 
+          ? MouseWheelActiveTrigger.Focused
+          : MouseWheelActiveTrigger.MouseOver;
+    }
+
     #endregion //MouseWheelActiveOnFocus
 
     #region ShowButtonSpinner
@@ -234,33 +275,6 @@ public override void OnApplyTemplate()
       SetValidSpinDirection();
     }
 
-    protected override void OnGotFocus( RoutedEventArgs e )
-    {
-      if( TextBox != null )
-        TextBox.Focus();
-    }
-
-    protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
-      switch( e.Key )
-      {
-        case Key.Up:
-          {
-            if( AllowSpin && !IsReadOnly )
-              DoIncrement();
-            e.Handled = true;
-            break;
-          }
-        case Key.Down:
-          {
-            if( AllowSpin && !IsReadOnly )
-              DoDecrement();
-            e.Handled = true;
-            break;
-          }
-      }
-    }
-
     protected override void OnKeyDown( KeyEventArgs e )
     {
       switch( e.Key )
@@ -276,25 +290,6 @@ protected override void OnKeyDown( KeyEventArgs e )
       }
     }
 
-    protected override void OnMouseWheel( MouseWheelEventArgs e )
-    {
-      base.OnMouseWheel( e );
-
-      if( !e.Handled && AllowSpin && !IsReadOnly && ( TextBox.IsFocused && MouseWheelActiveOnFocus ) )
-      {
-        if( e.Delta < 0 )
-        {
-          DoDecrement();
-        }
-        else if( 0 < e.Delta )
-        {
-          DoIncrement();
-        }
-
-        e.Handled = true;
-      }
-    }
-
     protected override void OnTextChanged( string oldValue, string newValue )
     {
       if( this.IsInitialized )
@@ -323,7 +318,17 @@ protected override void OnReadOnlyChanged( bool oldValue, bool newValue )
     private void OnSpinnerSpin( object sender, SpinEventArgs e )
     {
       if( AllowSpin && !IsReadOnly )
-        OnSpin( e );
+      {
+        var activeTrigger = this.MouseWheelActiveTrigger;
+        bool spin = !e.UsingMouseWheel;
+        spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver);
+        spin |= ( TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.Focused ) );
+
+        if( spin )
+        {
+          OnSpin( e );
+        }
+      }
     }
 
     #endregion //Event Handlers
@@ -369,14 +374,20 @@ protected override void OnInitialized( EventArgs e )
     {
       base.OnInitialized( e );
       // When both Value and Text are initialized, Value has priority.
-      bool updateValueFromText = ( this.Value == null );
-      this.SyncTextAndValueProperties( updateValueFromText, Text );
+      // To be sure that the value is not initialized, it should
+      // have no local value, no binding, and equal to the default value.
+      bool updateValueFromText =
+        ( this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue )
+        && ( BindingOperations.GetBinding( this, ValueProperty ) == null )
+        && ( object.Equals(this.Value, ValueProperty.DefaultMetadata.DefaultValue) );
+
+      this.SyncTextAndValueProperties( updateValueFromText, Text, !updateValueFromText );
     }
 
     /// <summary>
     /// Performs an increment if conditions allow it.
     /// </summary>
-    private void DoDecrement()
+    internal void DoDecrement()
     {
       if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
       {
@@ -387,7 +398,7 @@ private void DoDecrement()
     /// <summary>
     /// Performs a decrement if conditions allow it.
     /// </summary>
-    private void DoIncrement()
+    internal void DoIncrement()
     {
       if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
       {
@@ -431,7 +442,12 @@ public bool CommitInput()
       return this.SyncTextAndValueProperties( true, Text );
     }
 
-    protected bool SyncTextAndValueProperties(bool updateValueFromText, string text )
+    protected bool SyncTextAndValueProperties( bool updateValueFromText, string text )
+    {
+      return this.SyncTextAndValueProperties( updateValueFromText, text, false );
+    }
+
+    private bool SyncTextAndValueProperties(bool updateValueFromText, string text, bool forceTextUpdate )
     {
       if( _isSyncingTextAndValueProperties )
         return true;
@@ -444,7 +460,7 @@ protected bool SyncTextAndValueProperties(bool updateValueFromText, string text
         {
           if( string.IsNullOrEmpty( text ) )
           {
-            // An empty input set the value to the default value.
+            // An empty input sets the value to the default value.
             Value = this.DefaultValue;
           }
           else
@@ -472,8 +488,8 @@ protected bool SyncTextAndValueProperties(bool updateValueFromText, string text
         if(!_isTextChangedFromUI)
         {
           // Don't replace the empty Text with the non-empty representation of DefaultValue.
-          bool shouldKeepEmpty = string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue );
-          if( !shouldKeepEmpty )
+          bool shouldKeepEmpty = !forceTextUpdate && string.IsNullOrEmpty( Text ) && object.Equals( Value, DefaultValue );
+          if(  !shouldKeepEmpty )
           {
             Text = ConvertValueToText();
           }
@@ -486,8 +502,8 @@ protected bool SyncTextAndValueProperties(bool updateValueFromText, string text
         if( _isTextChangedFromUI && !parsedTextIsValid )
         {
           // Text input was made from the user and the text
-          // repesent an invalid value. Make the spinner "disable" 
-          // in these case.
+          // repesents an invalid value. Disable the spinner
+          // in this case.
           if( Spinner != null )
           {
             Spinner.ValidSpinDirection = ValidSpinDirections.None;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
index 4875440fd..47d287959 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/ValueRangeTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs
new file mode 100644
index 000000000..3c483c51e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowContainer.cs
@@ -0,0 +1,415 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.ComponentModel;
+using System.Windows.Input;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  public class WindowContainer : Canvas
+  {
+    #region Constructors
+
+    static WindowContainer()
+    {
+      // The default background must be transparent in order to be able to trap
+      // all mouse events when a modal window is displayed.
+      var defaultModalBackgroundBrush = new SolidColorBrush( Colors.Transparent );
+      defaultModalBackgroundBrush.Freeze();
+      ModalBackgroundBrushProperty = DependencyProperty.Register( "ModalBackgroundBrush", typeof( Brush ), typeof( WindowContainer ), new UIPropertyMetadata( defaultModalBackgroundBrush, OnModalBackgroundBrushChanged ) );
+    }
+
+
+    public WindowContainer()
+    {
+      this.SizeChanged += new SizeChangedEventHandler( this.WindowContainer_SizeChanged );
+      this.LayoutUpdated += new EventHandler( this.WindowContainer_LayoutUpdated );
+      this.Loaded += new RoutedEventHandler( WindowContainer_Loaded );
+      this.ClipToBounds = true;
+    }
+
+    void WindowContainer_Loaded( object sender, RoutedEventArgs e )
+    {
+      this.SetNextActiveWindow( null );
+    }
+
+    #endregion //Constructors
+
+    #region Members
+
+    private Brush _defaultBackgroundBrush;
+    private bool _isModalBackgroundApplied;
+
+    #endregion
+
+    #region Properties
+
+    #region ModalBackgroundBrush
+
+    /// <summary>
+    /// Identifies the ModalBackgroundBrush dependency property.
+    /// </summary>
+    // Initialized in the static constructor.
+    public static readonly DependencyProperty ModalBackgroundBrushProperty;
+
+    /// <summary>
+    /// When using a modal window in the WindowContainer, a ModalBackgroundBrush can be set
+    /// for the WindowContainer.
+    /// </summary>
+    public Brush ModalBackgroundBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( ModalBackgroundBrushProperty );
+      }
+      set
+      {
+        SetValue( ModalBackgroundBrushProperty, value );
+      }
+    }
+
+    private static void OnModalBackgroundBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      WindowContainer windowContainer = ( WindowContainer )d;
+      if( windowContainer != null )
+        windowContainer.OnModalBackgroundBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
+    }
+
+    protected virtual void OnModalBackgroundBrushChanged( Brush oldValue, Brush newValue )
+    {
+      this.SetModalBackground();
+    }
+
+    #endregion //ModalBackgroundBrush
+
+    #endregion
+
+    #region Base Class Override
+
+    /// <summary>
+    /// Measure the size of the WindowContainer based on its children.
+    /// </summary>
+    protected override Size MeasureOverride( Size constraint )
+    {
+      Size size = base.MeasureOverride( constraint );
+
+      if( this.Children.Count > 0 )
+      {
+        double width = double.IsNaN( this.Width )
+                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Left + w.DesiredSize.Width )
+                        : this.Width;
+        double height = double.IsNaN( this.Height )
+                        ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Top + w.DesiredSize.Height )
+                        : this.Height;
+        return new Size( Math.Min( width, constraint.Width), Math.Min( height, constraint.Height) );
+      }
+
+      return size;
+    }
+
+    /// <summary>
+    /// Register and unregister to children events.
+    /// </summary>
+    protected override void OnVisualChildrenChanged( DependencyObject visualAdded, DependencyObject visualRemoved )
+    {
+      base.OnVisualChildrenChanged( visualAdded, visualRemoved );
+
+      if( visualAdded != null && !( visualAdded is WindowControl ) )
+        throw new InvalidOperationException( "WindowContainer can only contain WindowControl types." );
+
+      if( visualRemoved != null )
+      {
+        WindowControl removedChild = ( WindowControl )visualRemoved;
+        removedChild.LeftChanged -= new EventHandler<EventArgs>( this.Child_LeftChanged );
+        removedChild.TopChanged -= new EventHandler<EventArgs>( this.Child_TopChanged );
+        removedChild.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
+        removedChild.IsVisibleChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
+        removedChild.IsKeyboardFocusWithinChanged -= new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
+        if( removedChild is ChildWindow )
+        {
+          ( ( ChildWindow )removedChild ).IsModalChanged -= new EventHandler<EventArgs>( this.Child_IsModalChanged );
+        }
+      }
+
+      if( visualAdded != null )
+      {
+        WindowControl addedChild = ( WindowControl )visualAdded;
+        addedChild.LeftChanged += new EventHandler<EventArgs>( this.Child_LeftChanged );
+        addedChild.TopChanged += new EventHandler<EventArgs>( this.Child_TopChanged );
+        addedChild.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.Child_PreviewMouseLeftButtonDown );
+        addedChild.IsVisibleChanged += new DependencyPropertyChangedEventHandler( this.Child_IsVisibleChanged );
+        addedChild.IsKeyboardFocusWithinChanged += new DependencyPropertyChangedEventHandler( this.Child_IsKeyboardFocusWithinChanged );
+        if( addedChild is ChildWindow )
+        {
+          ( ( ChildWindow )addedChild ).IsModalChanged += new EventHandler<EventArgs>( this.Child_IsModalChanged );
+        }
+      }
+    }
+
+    #endregion
+
+    #region Event Handler
+
+
+
+    private void Child_LeftChanged( object sender, EventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( windowControl != null )
+      {
+        windowControl.Left = this.GetRestrictedLeft( windowControl );
+      }
+
+      Canvas.SetLeft( windowControl, windowControl.Left );
+    }
+
+    private void Child_TopChanged( object sender, EventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( windowControl != null )
+      {
+        windowControl.Top = this.GetRestrictedTop( windowControl );
+      }
+
+      Canvas.SetTop( windowControl, windowControl.Top );
+    }
+
+    private void Child_PreviewMouseLeftButtonDown( object sender, RoutedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      this.SetNextActiveWindow( windowControl );
+    }
+
+    private void Child_IsModalChanged( object sender, EventArgs e )
+    {
+      this.SetModalBackground();
+    }
+
+    private void Child_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+
+      //Do not give access to data behind the WindowContainer as long as any child of WindowContainer is visible.
+      WindowControl firstVisibleChild = this.Children.OfType<WindowControl>().FirstOrDefault( ( x ) => x.Visibility == Visibility.Visible );
+      this.IsHitTestVisible = ( firstVisibleChild != null );
+
+      if( ( bool )e.NewValue )
+      {
+        this.SetChildPos( windowControl );
+        this.SetNextActiveWindow( windowControl );
+      }
+      else
+      {
+        this.SetNextActiveWindow( null );
+      }
+
+      WindowControl modalWindow = this.GetModalWindow();
+      foreach( WindowControl window in this.Children )
+      {
+        window.IsBlockMouseInputsPanelActive = ( modalWindow != null ) && !object.Equals( modalWindow, window );
+      }
+
+      this.SetModalBackground();
+    }
+
+    private void Child_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = ( WindowControl )sender;
+      if( ( bool )e.NewValue )
+      {
+        this.SetNextActiveWindow( windowControl );
+      }
+    }
+
+    private void WindowContainer_LayoutUpdated( object sender, EventArgs e )
+    {
+      foreach( WindowControl windowControl in this.Children )
+      {
+        //we only want to set the start position if this is the first time the control has bee initialized
+        if( !windowControl.IsStartupPositionInitialized && ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
+        {
+          this.SetChildPos( windowControl );
+          windowControl.IsStartupPositionInitialized = true;
+        }
+      }
+    }
+
+    private void WindowContainer_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      foreach( WindowControl windowControl in this.Children )
+      {
+        //reposition our windows
+        windowControl.Left = this.GetRestrictedLeft( windowControl );
+        windowControl.Top = this.GetRestrictedTop( windowControl );
+      }
+    }
+
+    #endregion
+
+    #region Private Methods
+
+    private void SetChildPos( WindowControl windowControl )
+    {
+      // A MessageBox with no X and Y will be centered.
+      // A ChildWindow with WindowStartupLocation == Center will be centered.
+      if( ( ( windowControl is MessageBox ) && ( windowControl.Left == 0 ) && ( windowControl.Top == 0 ) )
+        || ( ( windowControl is ChildWindow ) && ( ( ( ChildWindow )windowControl ).WindowStartupLocation == WindowStartupLocation.Center ) ) )
+      {
+        this.CenterChild( windowControl );
+      }
+      else
+      {
+        Canvas.SetLeft( windowControl, windowControl.Left );
+        Canvas.SetTop( windowControl, windowControl.Top );
+      }
+    }
+
+    private void CenterChild( WindowControl windowControl )
+    {
+      if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
+      {
+        windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
+        windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
+      }
+    }
+
+    private void SetNextActiveWindow( WindowControl windowControl )
+    {
+      if( !this.IsLoaded )
+        return;
+
+      WindowControl modalWindow = this.GetModalWindow();
+      // Modal window is always in front
+      if( modalWindow != null )
+      {
+        this.BringToFront( modalWindow );
+      }
+      else if( windowControl != null )
+      {
+        this.BringToFront( windowControl );
+      }
+      else
+      {
+        this.BringToFront( this.Children.OfType<WindowControl>().FirstOrDefault( (x) => x.Visibility == Visibility.Visible ) );
+      }
+    }
+
+    private void BringToFront( WindowControl windowControl )
+    {
+      if( windowControl != null )
+      {
+        int maxZIndez = this.Children.OfType<WindowControl>().Max( ( x ) => Canvas.GetZIndex( x ) );
+        Canvas.SetZIndex( windowControl, maxZIndez + 1 );
+
+        windowControl.Focus();
+
+        this.SetActiveWindow( windowControl );
+      }
+    }
+
+    private void SetActiveWindow( WindowControl windowControl )
+    {
+      foreach( WindowControl window in this.Children )
+      {
+        window.SetIsActiveInternal( false );
+      }
+      windowControl.SetIsActiveInternal( true );
+    }
+
+    private bool IsModalWindow( WindowControl windowControl )
+    {
+      return ( ( windowControl is MessageBox )
+             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal ) );
+    }
+
+    private WindowControl GetModalWindow()
+    {
+      return this.Children.OfType<WindowControl>()
+                      .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
+                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) );
+    }
+
+    private double GetRestrictedLeft( WindowControl windowControl )
+    {
+      if( windowControl.Left < 0 )
+        return 0;
+
+      if( ( ( windowControl.Left + windowControl.ActualWidth ) > this.ActualWidth ) && ( this.ActualWidth != 0 ) )
+      {
+        double x = this.ActualWidth - windowControl.ActualWidth;
+        return x < 0 ? 0 : x;
+      }
+
+      return windowControl.Left;
+    }
+
+    private double GetRestrictedTop( WindowControl windowControl )
+    {
+      if( windowControl.Top < 0 )
+        return 0;
+
+      if( ( ( windowControl.Top + windowControl.ActualHeight ) > this.ActualHeight ) && ( this.ActualHeight != 0 ) )
+      {
+        double y = this.ActualHeight - windowControl.ActualHeight;
+        return y < 0 ? 0 : y;
+      }
+
+      return windowControl.Top;
+    }
+
+    private void SetModalBackground()
+    {
+      // We have a modal window and a ModalBackgroundBrush set.
+      if( ( this.GetModalWindow() != null ) && ( this.ModalBackgroundBrush != null ) )
+      {
+        if( !_isModalBackgroundApplied )
+        {
+          _defaultBackgroundBrush = this.Background;
+          _isModalBackgroundApplied = true;
+        }
+
+        this.Background = this.ModalBackgroundBrush;
+
+      }
+      else
+      {
+        if( _isModalBackgroundApplied )
+        {
+          this.Background = _defaultBackgroundBrush;
+          _defaultBackgroundBrush = null;
+          _isModalBackgroundApplied = false;
+        }
+      }
+    }
+
+
+
+
+
+    #endregion
+  }
+
+
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs
new file mode 100644
index 000000000..6df44225d
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Primitives/WindowControl.cs
@@ -0,0 +1,817 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+using System.Windows.Media;
+using System.Windows.Controls.Primitives;
+using System.Windows.Input;
+using System.IO;
+using Xceed.Wpf.Toolkit.Core;
+using System.ComponentModel;
+
+namespace Xceed.Wpf.Toolkit.Primitives
+{
+  [TemplatePart( Name = PART_HeaderThumb, Type = typeof( Thumb ) )]
+  [TemplatePart( Name = PART_Icon, Type = typeof( Image ) )]
+  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]  
+  [TemplatePart( Name = PART_ToolWindowCloseButton, Type = typeof( Button ) )]
+  [TemplatePart( Name = PART_BlockMouseInputsBorder, Type = typeof( Border ) )]
+  [TemplatePart( Name = PART_HeaderGrid, Type = typeof( Grid ) )]
+  public class WindowControl : ContentControl
+  {
+    public static readonly ComponentResourceKey DefaultCloseButtonStyleKey = new ComponentResourceKey( typeof( WindowControl ), "DefaultCloseButtonStyle" );
+
+    private const string PART_HeaderThumb = "PART_HeaderThumb";
+    private const string PART_Icon = "PART_Icon";
+    private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_ToolWindowCloseButton = "PART_ToolWindowCloseButton";
+    private const string PART_BlockMouseInputsBorder = "PART_BlockMouseInputsBorder";
+    private const string PART_HeaderGrid = "PART_HeaderGrid";
+
+    #region Members
+
+    private Thumb _headerThumb;
+    private Image _icon;
+    private Button _closeButton;
+    private Button _windowToolboxCloseButton;
+    private bool _setIsActiveInternal;
+    internal Border _windowBlockMouseInputsPanel;
+
+    #endregion
+
+    #region Constructors
+
+    static WindowControl()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WindowControl ), new FrameworkPropertyMetadata( typeof( WindowControl ) ) );
+    }
+
+    public WindowControl()
+    {
+    }
+
+    #endregion //Constructors
+
+    #region Dependency Properties
+
+    #region Public DP
+
+    #region Caption
+
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( WindowControl ), new UIPropertyMetadata( String.Empty ) );
+    public string Caption
+    {
+      get
+      {
+        return ( string )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
+
+    #endregion //Caption
+
+    #region CaptionForeground
+
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
+
+    #endregion //CaptionForeground
+
+    #region CaptionShadowBrush
+
+    public static readonly DependencyProperty CaptionShadowBrushProperty = DependencyProperty.Register( "CaptionShadowBrush", typeof( Brush ), typeof( WindowControl ), new UIPropertyMetadata( new SolidColorBrush( Color.FromArgb( 179, 255, 255, 255 ) ) ) );
+    public Brush CaptionShadowBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionShadowBrushProperty );
+      }
+      set
+      {
+        SetValue( CaptionShadowBrushProperty, value );
+      }
+    }
+
+    #endregion //CaptionShadowBrush
+
+    #region CaptionIcon
+
+    public static readonly DependencyProperty CaptionIconProperty = DependencyProperty.Register( "CaptionIcon", typeof( ImageSource ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public ImageSource CaptionIcon
+    {
+      get
+      {
+        return ( ImageSource )GetValue( CaptionIconProperty );
+      }
+      set
+      {
+        SetValue( CaptionIconProperty, value );
+      }
+    }
+
+    #endregion //CaptionIcon
+
+    #region CloseButtonStyle
+
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( WindowControl ), new UIPropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
+
+    #endregion //CloseButtonStyle
+
+    #region CloseButtonVisibility
+
+    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( WindowControl ), new PropertyMetadata( Visibility.Visible, null, OnCoerceCloseButtonVisibility ) );
+    public Visibility CloseButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
+    }
+
+    private static object OnCoerceCloseButtonVisibility( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      WindowControl windowControl = d as WindowControl;
+      if( windowControl == null )
+        return basevalue;
+      return windowControl.OnCoerceCloseButtonVisibility( ( Visibility )basevalue );
+    }
+
+    protected virtual object OnCoerceCloseButtonVisibility( Visibility newValue )
+    {
+      return newValue;
+    }
+
+    #endregion //CloseButtonVisibility
+
+    #region IsActive
+
+    public static readonly DependencyProperty IsActiveProperty = DependencyProperty.Register( "IsActive", typeof( bool ), typeof( WindowControl ), new UIPropertyMetadata( true, null, OnCoerceIsActive ) );
+    public bool IsActive
+    {
+      get
+      {
+        return ( bool )GetValue( IsActiveProperty );
+      }
+      set
+      {
+        SetValue( IsActiveProperty, value );
+      }
+    }
+
+    private static object OnCoerceIsActive( DependencyObject d, object basevalue )
+    {
+      WindowControl w = d as WindowControl;
+      if( w != null && !w._setIsActiveInternal && !w.AllowPublicIsActiveChange )
+        throw new InvalidOperationException( "Cannot set IsActive directly. This is handled by the underlying system" );
+
+      return basevalue;
+    }
+
+    internal void SetIsActiveInternal( bool isActive )
+    {
+      _setIsActiveInternal = true;
+      this.IsActive = isActive;
+      _setIsActiveInternal = false;
+    }
+
+    #endregion //IsActive
+
+
+
+
+
+
+
+
+
+    #region Left
+
+    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ), OnCoerceLeft ) );
+    public double Left
+    {
+      get
+      {
+        return ( double )GetValue( LeftProperty );
+      }
+      set
+      {
+        SetValue( LeftProperty, value );
+      }
+    }
+
+    private static object OnCoerceLeft( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      var windowControl = ( WindowControl )d;
+      if( windowControl == null )
+        return basevalue;
+
+      return windowControl.OnCoerceLeft( basevalue );
+    }
+
+    private object OnCoerceLeft( object newValue )
+    {
+      var value = ( double )newValue;
+      if( object.Equals( value, double.NaN ) )
+        return 0.0;
+
+      return newValue;
+    }
+
+    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = obj as WindowControl;
+      if( windowControl != null )
+        windowControl.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    internal event EventHandler<EventArgs> LeftChanged;
+
+    protected virtual void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      EventHandler<EventArgs> handler = LeftChanged;
+      if( handler != null )
+      {
+        handler( this, EventArgs.Empty );
+      }
+    }
+
+    #endregion //Left
+
+    #region Top
+
+    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ), OnCoerceTop ) );
+    public double Top
+    {
+      get
+      {
+        return ( double )GetValue( TopProperty );
+      }
+      set
+      {
+        SetValue( TopProperty, value );
+      }
+    }
+
+    private static object OnCoerceTop( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      var windowControl = ( WindowControl )d;
+      if( windowControl == null )
+        return basevalue;
+
+      return windowControl.OnCoerceTop( basevalue );
+    }
+
+    private object OnCoerceTop( object newValue )
+    {
+      var value = ( double )newValue;
+      if( object.Equals( value, double.NaN ) )
+        return 0.0;
+
+      return newValue;
+    }
+
+    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl windowControl = obj as WindowControl;
+      if( windowControl != null )
+        windowControl.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
+
+    internal event EventHandler<EventArgs> TopChanged;
+
+    protected virtual void OnTopPropertyChanged( double oldValue, double newValue )
+    {
+      EventHandler<EventArgs> handler = TopChanged;
+      if( handler != null )
+      {
+        handler( this, EventArgs.Empty );
+      }
+    }
+
+    #endregion //TopProperty
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+    #region WindowBackground
+
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
+
+    #endregion // WindowBackground
+
+    #region WindowBorderBrush
+
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderBrush
+
+    #region WindowBorderThickness
+
+    public static readonly DependencyProperty WindowBorderThicknessProperty = DependencyProperty.Register( "WindowBorderThickness", typeof( Thickness ), typeof( WindowControl ), new PropertyMetadata( new Thickness( 0 ) ) );
+    public Thickness WindowBorderThickness
+    {
+      get
+      {
+        return ( Thickness )GetValue( WindowBorderThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderThicknessProperty, value );
+      }
+    }
+
+    #endregion //WindowBorderThickness
+
+    #region WindowInactiveBackground
+
+    public static readonly DependencyProperty WindowInactiveBackgroundProperty = DependencyProperty.Register( "WindowInactiveBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
+    public Brush WindowInactiveBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowInactiveBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowInactiveBackgroundProperty, value );
+      }
+    }
+
+    #endregion // WindowInactiveBackground
+
+    #region WindowOpacity
+
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( WindowControl ), new PropertyMetadata( 1d ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
+
+    #endregion //WindowOpacity
+
+    #region WindowStyle
+
+    public static readonly DependencyProperty WindowStyleProperty = DependencyProperty.Register( "WindowStyle", typeof( WindowStyle ), typeof( WindowControl ), new PropertyMetadata( WindowStyle.SingleBorderWindow, null, OnCoerceWindowStyle ) );
+    public WindowStyle WindowStyle
+    {
+      get
+      {
+        return ( WindowStyle )GetValue( WindowStyleProperty );
+      }
+      set
+      {
+        SetValue( WindowStyleProperty, value );
+      }
+    }
+
+    private static object OnCoerceWindowStyle( DependencyObject d, object basevalue )
+    {
+      if( basevalue == DependencyProperty.UnsetValue )
+        return basevalue;
+
+      WindowControl windowControl = d as WindowControl;
+      if( windowControl == null )
+        return basevalue;
+      return windowControl.OnCoerceWindowStyle( ( WindowStyle )basevalue );
+    }
+
+    protected virtual object OnCoerceWindowStyle( WindowStyle newValue )
+    {
+      return newValue;
+    }
+
+    private static void OnWindowStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      WindowControl window = ( WindowControl )d;
+      if( window != null )
+        window.OnWindowStyleChanged( ( WindowStyle )e.OldValue, ( WindowStyle )e.NewValue );
+    }
+
+    protected virtual void OnWindowStyleChanged( WindowStyle oldValue, WindowStyle newValue )
+    {
+    }
+
+    #endregion //WindowStyle  
+
+    #region WindowThickness
+
+    public static readonly DependencyProperty WindowThicknessProperty = DependencyProperty.Register( "WindowThickness", typeof( Thickness ), typeof( WindowControl ),
+                                                                        new PropertyMetadata( new Thickness( SystemParameters.ResizeFrameVerticalBorderWidth - 3,
+                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3,
+                                                                                                            SystemParameters.ResizeFrameVerticalBorderWidth - 3,
+                                                                                                            SystemParameters.ResizeFrameHorizontalBorderHeight - 3 ) ) );
+    public Thickness WindowThickness
+    {
+      get
+      {
+        return ( Thickness )GetValue( WindowThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowThicknessProperty, value );
+      }
+    }
+
+    #endregion //WindowThickness
+
+    #endregion //Public DP
+
+    #endregion //Dependency Properties
+
+    #region Internal Properties
+
+    internal bool IsStartupPositionInitialized
+    {
+      get;
+      set;
+    }
+
+    #region IsBlockMouseInputsPanelActive (Internal)
+
+    internal bool IsBlockMouseInputsPanelActive
+    {
+      get
+      {
+        return _IsBlockMouseInputsPanelActive;
+      }
+      set
+      {
+        if( value != _IsBlockMouseInputsPanelActive )
+        {
+          _IsBlockMouseInputsPanelActive = value;         
+          this.UpdateBlockMouseInputsPanel();
+        }
+      }
+    }
+
+    private bool _IsBlockMouseInputsPanelActive;
+
+    #endregion
+
+    internal virtual bool AllowPublicIsActiveChange
+    {
+      get { return true; }
+    }
+
+
+    #endregion //Internal Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _headerThumb != null )
+      {
+        _headerThumb.PreviewMouseLeftButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
+        _headerThumb.PreviewMouseRightButtonDown -= new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
+        _headerThumb.DragDelta -= new DragDeltaEventHandler( this.HeaderThumbDragDelta );
+      }
+      _headerThumb = this.Template.FindName( PART_HeaderThumb, this ) as Thumb;
+      if( _headerThumb != null )
+      {
+        _headerThumb.PreviewMouseLeftButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseLeftButtonDown );
+        _headerThumb.PreviewMouseRightButtonDown += new MouseButtonEventHandler( this.HeaderPreviewMouseRightButtonDown );
+        _headerThumb.DragDelta += new DragDeltaEventHandler( this.HeaderThumbDragDelta );
+      }
+
+      if( _icon != null )
+      {
+        _icon.MouseLeftButtonDown -= new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
+      }
+      _icon = this.Template.FindName( PART_Icon, this ) as Image;
+      if( _icon != null )
+      {
+        _icon.MouseLeftButtonDown += new MouseButtonEventHandler( this.IconMouseLeftButtonDown );
+      }
+
+      if( _closeButton != null )
+      {
+        _closeButton.Click -= new RoutedEventHandler( this.Close );
+      }
+      _closeButton = this.Template.FindName( PART_CloseButton, this ) as Button;
+      if( _closeButton != null )
+      {
+        _closeButton.Click += new RoutedEventHandler( this.Close );
+      }
+
+      if( _windowToolboxCloseButton != null )
+      {
+        _windowToolboxCloseButton.Click -= new RoutedEventHandler( this.Close );
+      }
+      _windowToolboxCloseButton = this.Template.FindName( PART_ToolWindowCloseButton, this ) as Button;
+      if( _windowToolboxCloseButton != null )
+      {
+        _windowToolboxCloseButton.Click += new RoutedEventHandler( this.Close );
+      }
+
+      _windowBlockMouseInputsPanel = this.Template.FindName( PART_BlockMouseInputsBorder, this ) as Border;
+      this.UpdateBlockMouseInputsPanel();
+
+
+
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    #region HeaderMouseLeftButtonClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseLeftButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseLeftButtonClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseLeftButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseLeftButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseLeftButtonClickedEvent
+
+    #region HeaderMouseRightButtonClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseRightButtonClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseRightButtonClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseRightButtonClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseRightButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseRightButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseRightButtonClickedEvent
+
+    #region HeaderMouseLeftButtonDoubleClickedEvent
+
+    public static readonly RoutedEvent HeaderMouseLeftButtonDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderMouseLeftButtonDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderMouseLeftButtonDoubleClicked
+    {
+      add
+      {
+        AddHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderMouseLeftButtonDoubleClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderMouseLeftButtonDoubleClickedEvent
+
+    #region HeaderDragDeltaEvent
+
+    public static readonly RoutedEvent HeaderDragDeltaEvent = EventManager.RegisterRoutedEvent( "HeaderDragDelta", RoutingStrategy.Bubble, typeof( DragDeltaEventHandler ), typeof( WindowControl ) );
+    public event DragDeltaEventHandler HeaderDragDelta
+    {
+      add
+      {
+        AddHandler( HeaderDragDeltaEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderDragDeltaEvent, value );
+      }
+    }
+
+    #endregion //HeaderDragDeltaEvent
+
+    #region HeaderIconClickedEvent
+
+    public static readonly RoutedEvent HeaderIconClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderIconClicked
+    {
+      add
+      {
+        AddHandler( HeaderIconClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderIconClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderIconClickedEvent
+
+    #region HeaderIconDoubleClickedEvent
+
+    public static readonly RoutedEvent HeaderIconDoubleClickedEvent = EventManager.RegisterRoutedEvent( "HeaderIconDoubleClicked", RoutingStrategy.Bubble, typeof( MouseButtonEventHandler ), typeof( WindowControl ) );
+    public event MouseButtonEventHandler HeaderIconDoubleClicked
+    {
+      add
+      {
+        AddHandler( HeaderIconDoubleClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HeaderIconDoubleClickedEvent, value );
+      }
+    }
+
+    #endregion //HeaderIconDoubleClickedEvent
+
+    #region CloseButtonClickedEvent
+
+    public static readonly RoutedEvent CloseButtonClickedEvent = EventManager.RegisterRoutedEvent( "CloseButtonClicked", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( WindowControl ) );
+    public event RoutedEventHandler CloseButtonClicked
+    {
+      add
+      {
+        AddHandler( CloseButtonClickedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( CloseButtonClickedEvent, value );
+      }
+    }
+
+    #endregion //CloseButtonClickedEvent
+
+
+
+
+
+
+
+
+
+
+    #endregion //Events
+
+    #region Event Handler
+
+    private void HeaderPreviewMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderMouseLeftButtonDoubleClickedEvent : HeaderMouseLeftButtonClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void HeaderPreviewMouseRightButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Right );
+      args.RoutedEvent = HeaderMouseRightButtonClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void HeaderThumbDragDelta( object sender, DragDeltaEventArgs e )
+    {
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void IconMouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = ( e.ClickCount == 2 ) ? HeaderIconDoubleClickedEvent : HeaderIconClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+    }
+
+    private void Close( object sender, RoutedEventArgs e )
+    {
+      this.RaiseEvent( new RoutedEventArgs( CloseButtonClickedEvent, this ) );
+    }
+
+
+
+
+    #endregion // Event Handler
+
+    #region Internal Methods
+
+    internal virtual void UpdateBlockMouseInputsPanel()
+    {
+      if( _windowBlockMouseInputsPanel != null )
+      {
+        _windowBlockMouseInputsPanel.Visibility = this.IsBlockMouseInputsPanelActive ? Visibility.Visible : Visibility.Collapsed;
+      }
+    }
+
+    internal double GetHeaderHeight()
+    {
+      Grid headerGrid = this.Template.FindName( PART_HeaderGrid, this ) as Grid;
+      if( headerGrid != null )
+        return headerGrid.ActualHeight;
+      return 0;
+    }
+
+    #endregion
+
+    #region Private Methods
+
+
+    #endregion //Private Methods
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
index 74cc72968..af1917529 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
index 12967d18d..f05278e75 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Core
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
index 9e5b64821..9a5459f77 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
index c6809cc1f..b4c8ea121 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml
new file mode 100644
index 000000000..7d38c7080
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/SelectorItem.xaml
@@ -0,0 +1,53 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background" 
+                            Background="{TemplateBinding Background}" 
+                            BorderBrush="{TemplateBinding BorderBrush}" 
+                            BorderThickness="{TemplateBinding BorderThickness}">
+                  <CheckBox Foreground="{TemplateBinding Foreground}" 
+                                  IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" 
+                                  Content="{TemplateBinding Content}" 
+                                  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="#FFB8E0F3" />
+                     <Setter TargetName="_background" Property="BorderBrush" Value="#FF26A0DA" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml
new file mode 100644
index 000000000..7dc90c807
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Aero2/WindowControl.xaml
@@ -0,0 +1,268 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <sys:Double x:Key="TopBorderThumbHeight">8</sys:Double>
+
+    <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
+    <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
+
+    <!-- =============================================================================== -->
+    <!-- WindowControl                                                                    -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="WindowControlTemplate" TargetType="{x:Type local:WindowControl}">
+        <Grid>
+            <Border x:Name="PART_WindowRoot"
+                          BorderThickness="{TemplateBinding WindowBorderThickness}"
+                          BorderBrush="{TemplateBinding WindowBorderBrush}"
+                          CornerRadius="0"
+                          Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}">
+                <Border.Background>
+                    <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
+                        <Binding Path="WindowBackground" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="WindowOpacity" RelativeSource="{RelativeSource TemplatedParent}" />
+                    </MultiBinding>
+                </Border.Background>
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+
+               <!-- Header Grid-->
+                    <Grid x:Name="PART_HeaderGrid">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            <ColumnDefinition Width="Auto" />
+                            <ColumnDefinition Width="*" />
+                            <ColumnDefinition x:Name="HeaderButtonsColumn" Width="{Binding ActualWidth, ElementName=ButtonsPanel}"/>
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                            <RowDefinition x:Name="HeaderRow" Height="22" />
+                            <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </Grid.RowDefinitions>
+
+                        <!-- Icon and Title -->
+                        <Image x:Name="PART_Icon"
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Grid.Column="1"
+                                       VerticalAlignment="Center"
+                                       Source="{TemplateBinding CaptionIcon}"
+                                       MaxWidth="15"
+                                       MaxHeight="15"
+                                       Margin="0,2,0,2">
+                        </Image>
+                        <Grid x:Name="Title"
+                                 Grid.Column="2"
+                                 Grid.Row="0"
+                                 Grid.RowSpan="2">
+                              <!-- Rectangle behind title to display a glow effect on title -->
+                               <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}" 
+                                          Height="{Binding ElementName=TitleGrid, Path=ActualHeight}" 
+                                          HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}" 
+                                          VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
+                                          Fill="{TemplateBinding CaptionShadowBrush}">
+                                   <Rectangle.Effect>
+                                       <BlurEffect Radius="10" />
+                                   </Rectangle.Effect>
+                               </Rectangle>
+                              <Grid x:Name="TitleGrid"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center">
+                                 <TextBlock x:Name="TitleText"
+                                            Text="{TemplateBinding Caption}"
+                                            Foreground="{TemplateBinding CaptionForeground}"
+                                            TextTrimming="CharacterEllipsis"
+                                            Margin="5,0,5,0" />
+                              </Grid>
+                           </Grid>
+
+                        <!-- Header Drag Thumb -->
+                        <Thumb x:Name="PART_HeaderThumb" 
+                                       Grid.Row="0"
+                                       Grid.RowSpan="2"
+                                       Grid.Column="2"
+                                       Opacity="0"
+                                       IsTabStop="False"/>
+                    </Grid>
+
+                    <!-- Content Border -->
+                    <Border x:Name="ContentOuterBorder" Grid.Row="1" BorderBrush="Gray" BorderThickness="1">
+                        <Border.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="0">
+                                <Binding Path="WindowThickness.Left" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Bottom" RelativeSource="{RelativeSource TemplatedParent}" />
+                            </MultiBinding>
+                        </Border.Margin>
+                        <Border x:Name="ContentBorder"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        Background="{TemplateBinding Background}" 
+                                        BorderBrush="{TemplateBinding BorderBrush}" >
+                            <ContentPresenter x:Name="Content"
+                                                    Content="{TemplateBinding Content}" 
+                                                    ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </Border>
+                    </Border>
+
+
+                    <!-- Close-Maximize-Minimize Buttons -->
+                    <StackPanel x:Name="ButtonsPanel"
+                                        Orientation="Horizontal" 
+                                        VerticalAlignment="Top" 
+                                        HorizontalAlignment="Right">
+                        <StackPanel.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <!-- not used -->
+                            </MultiBinding>
+                        </StackPanel.Margin>
+
+
+
+
+                        <!--close button-->
+                        <Border Margin="1,0,0,0">
+                            <Button x:Name="PART_CloseButton"
+                                            SnapsToDevicePixels="False"
+                                            Style="{TemplateBinding CloseButtonStyle}" 
+                                            ToolTip="Close"
+                                            Visibility="{TemplateBinding CloseButtonVisibility}"
+                                            Height="20" Width="45" 
+                                            IsTabStop="False">
+                                <Path Height="9"
+                                                RenderOptions.EdgeMode="Aliased"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Width="9"
+                                                Fill="White"
+                                                Stretch="None"
+                                                Stroke="Transparent" 
+                                                Data="{StaticResource closeGeometry}">
+                                    <Path.RenderTransform>
+                                        <TranslateTransform X="1"  Y="1" />
+                                    </Path.RenderTransform>
+                                </Path>
+                            </Button>
+                        </Border>
+                    </StackPanel>
+
+                    <!-- ToolWindow Close Button -->
+                    <Border x:Name="ToolWindowBorder"
+                                        VerticalAlignment="Top" 
+                                        Visibility="Collapsed"
+                                        HorizontalAlignment="Right">
+                        <Border.Margin>
+                            <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                <!-- not used -->
+                            </MultiBinding>
+                        </Border.Margin>
+                        <Button x:Name="PART_ToolWindowCloseButton"
+                                            SnapsToDevicePixels="False"
+                                            Style="{TemplateBinding CloseButtonStyle}"
+                                            Height="20" Width="45" 
+                                            IsTabStop="False">
+                            <Path Height="9"
+                                                RenderOptions.EdgeMode="Aliased"
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                Width="9"
+                                                Fill="White"
+                                                Stretch="None"
+                                                Stroke="Transparent" 
+                                                Data="{StaticResource closeGeometry}">
+                                <Path.RenderTransform>
+                                    <TranslateTransform X="1"  Y="1" />
+                                </Path.RenderTransform>
+                            </Path>
+                        </Button>
+                    </Border>
+                </Grid>
+            </Border>
+
+            <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
+            <Border x:Name="PART_BlockMouseInputsBorder" Background="Transparent" Visibility="Collapsed"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+
+            <Trigger Property="WindowStyle" Value="None">
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Title" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_HeaderThumb" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+            </Trigger>
+            <Trigger Property="WindowStyle" Value="ToolWindow">
+                <Setter Property="Width" Value="{Binding ActualWidth, ElementName=ToolWindowBorder}" TargetName="HeaderButtonsColumn" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+                <Setter Property="Visibility" Value="Visible" TargetName="ToolWindowBorder" />
+            </Trigger>
+
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+            </Trigger>
+
+            <Trigger Property="IsActive" Value="False">
+                <Setter Property="Background" Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FFD3D3D3" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FFDADADA" TargetName="ContentOuterBorder" />
+            </Trigger>
+
+            <!-- #TODODOC-->
+            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
+            <Trigger Property="Text" Value="" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WindowControl}">
+      <Setter Property="CloseButtonStyle" Value="{StaticResource {ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type local:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}}" />
+        <Setter Property="Background" Value="{StaticResource Window_Background}" />
+        <Setter Property="CaptionForeground" Value="{StaticResource Window_CaptionForeground}" />
+        <Setter Property="CaptionShadowBrush" Value="{StaticResource Window_CaptionShadowBrush}" />
+        <Setter Property="WindowBorderBrush" Value="{StaticResource Window_WindowBorderBrush}" />
+        <Setter Property="WindowBackground" Value="{StaticResource Window_WindowBackground}" />
+        <Setter Property="WindowBorderThickness" Value="{StaticResource Window_WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground" Value="{StaticResource Window_WindowInactiveBackground}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="Template" Value="{StaticResource WindowControlTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml
new file mode 100644
index 000000000..aff566467
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/SelectorItem.xaml
@@ -0,0 +1,59 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives" >
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Background"
+           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+
+      <Setter Property="IsTabStop"
+               Value="False" />
+
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <CheckBox Foreground="{TemplateBinding Foreground}"
+                              IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
+                              Content="{TemplateBinding Content}"
+                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                  </Trigger>
+                  <Trigger Property="IsKeyboardFocusWithin" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml
new file mode 100644
index 000000000..36c301c69
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/Generic/WindowControl.xaml
@@ -0,0 +1,228 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:core="clr-namespace:Xceed.Wpf.Toolkit.Core"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+         <ResourceDictionary Source="../../../Themes/Generic/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+   <sys:Double x:Key="TopBorderThumbHeight">8</sys:Double>
+
+    <conv:WindowContentBorderMarginConverter x:Key="WindowContentBorderMarginConverter" />
+    <conv:WindowControlBackgroundConverter x:Key="WindowControlBackgroundConverter" />
+    <BooleanToVisibilityConverter x:Key="booleanToVisibilityConverter"/>
+
+   <!-- =============================================================================== -->
+   <!-- WindowControl                                                                    -->
+   <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="WindowControlTemplate" TargetType="{x:Type local:WindowControl}">
+        <Grid>
+            <Border x:Name="PART_WindowRoot"
+                          BorderThickness="{TemplateBinding WindowBorderThickness}"
+                          BorderBrush="{TemplateBinding WindowBorderBrush}"
+                          CornerRadius="6"
+                          Width="{TemplateBinding Width}"
+                          Height="{TemplateBinding Height}">
+                <Border.Background>
+                    <MultiBinding Converter="{StaticResource WindowControlBackgroundConverter}">
+                        <Binding Path="WindowBackground" RelativeSource="{RelativeSource TemplatedParent}" />
+                        <Binding Path="WindowOpacity" RelativeSource="{RelativeSource TemplatedParent}" />
+                    </MultiBinding>
+                </Border.Background>
+                <Border x:Name="WindowRootInnerBorder" BorderThickness="1" BorderBrush="White" CornerRadius="6">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Header Grid-->
+                        <Grid x:Name="PART_HeaderGrid">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="{Binding WindowThickness.Left, RelativeSource={RelativeSource TemplatedParent}}"/>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition x:Name="HeaderButtonsColumn" Width="{Binding ActualWidth, ElementName=ButtonsPanel}"/>
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition x:Name="HeaderRow" Height="22" />
+                                <RowDefinition Height="{Binding WindowThickness.Top, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </Grid.RowDefinitions>
+
+                            <!-- Icon and Title -->
+                            <Image x:Name="PART_Icon"
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="1"
+                                VerticalAlignment="Center"
+                                Source="{TemplateBinding CaptionIcon}"
+                                MaxWidth="15"
+                                MaxHeight="15"
+                                Margin="0,2,0,2">
+                            </Image>
+                           <Grid x:Name="Title"
+                                 Grid.Column="2"
+                                 Grid.Row="0"
+                                 Grid.RowSpan="2">
+                              <!-- Rectangle behind title to display a glow effect on title -->
+                               <Rectangle Width="{Binding ElementName=TitleGrid, Path=ActualWidth}" 
+                                          Height="{Binding ElementName=TitleGrid, Path=ActualHeight}" 
+                                          HorizontalAlignment="{Binding ElementName=TitleGrid, Path=HorizontalAlignment}" 
+                                          VerticalAlignment="{Binding ElementName=TitleGrid, Path=VerticalAlignment}"
+                                          Fill="{TemplateBinding CaptionShadowBrush}">
+                                   <Rectangle.Effect>
+                                       <BlurEffect Radius="10" />
+                                   </Rectangle.Effect>
+                              </Rectangle>
+                              <Grid x:Name="TitleGrid"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center">
+                                 <TextBlock x:Name="TitleText"
+                                            Text="{TemplateBinding Caption}"
+                                            Foreground="{TemplateBinding CaptionForeground}"
+                                            TextTrimming="CharacterEllipsis"
+                                            Margin="5,0,5,0" />
+                              </Grid>
+                           </Grid>
+
+                            <!-- Header Drag Thumb -->
+                            <Thumb x:Name="PART_HeaderThumb" 
+                                Grid.Row="0"
+                                Grid.RowSpan="2"
+                                Grid.Column="2"
+                                Opacity="0"
+                                IsTabStop="False"/>
+                        </Grid>
+
+                        <!-- Content Border -->
+                        <Border x:Name="ContentOuterBorder" Grid.Row="1" BorderBrush="#FFDFEEFD" BorderThickness="1">
+                            <Border.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="0">
+                                    <Binding Path="WindowThickness.Left" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Bottom" RelativeSource="{RelativeSource TemplatedParent}" />
+                                </MultiBinding>
+                            </Border.Margin>
+                            <Border x:Name="ContentBorder" Background="{TemplateBinding Background}" BorderBrush="#5D6C7A" BorderThickness="1" >
+                                <Border x:Name="ContentInnerBorder" BorderBrush="#FFF2F2F2" BorderThickness="0"> <!-- only visible for ToolWindow -->
+                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                                </Border>
+                            </Border>
+                        </Border>
+
+                        <!-- Close-Maximize-Minimize Buttons -->
+                        <StackPanel x:Name="ButtonsPanel" Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right">
+                            <StackPanel.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" /> <!-- not used -->
+                                </MultiBinding>
+                            </StackPanel.Margin>
+                            <!--close button-->
+                           <Button x:Name="PART_CloseButton"
+                                    Style="{TemplateBinding CloseButtonStyle}" 
+                                    Visibility="{TemplateBinding CloseButtonVisibility}" />
+                        </StackPanel>
+
+                        <!-- ToolWindow Close Button -->
+                        <Border x:Name="ToolWindowBorder"
+                                VerticalAlignment="Top"
+                                Visibility="Collapsed"
+                                HorizontalAlignment="Right">
+                            <Border.Margin>
+                                <MultiBinding Converter="{StaticResource WindowContentBorderMarginConverter}" ConverterParameter="2">
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" />
+                                    <Binding Path="WindowThickness.Right" RelativeSource="{RelativeSource TemplatedParent}" /> <!-- not used -->
+                                </MultiBinding>
+                            </Border.Margin>
+                            <Button x:Name="PART_ToolWindowCloseButton"
+                                    Margin="0,3,0,1"
+                                    Style="{TemplateBinding CloseButtonStyle}" >
+                            </Button>
+                        </Border>
+                    </Grid>
+                </Border>
+            </Border>
+
+            <!-- Special Border to prevent all mouse inputs when this WindowControl is behind a modal window -->
+            <Border x:Name="PART_BlockMouseInputsBorder" Background="Transparent" Visibility="Collapsed"/>
+        </Grid>
+        <ControlTemplate.Triggers>
+
+            <Trigger Property="WindowStyle" Value="None">
+                <Setter Property="Height" Value="0" TargetName="HeaderRow" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Title" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_HeaderThumb" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+            </Trigger>
+            <Trigger Property="WindowStyle" Value="ToolWindow">
+                <Setter Property="Height" Value="Auto" TargetName="HeaderRow" />
+                <Setter Property="Width" Value="{Binding ActualWidth, ElementName=ToolWindowBorder}" TargetName="HeaderButtonsColumn" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="PART_Icon" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="ButtonsPanel" />
+                <Setter Property="Visibility" Value="Visible" TargetName="ToolWindowBorder" />
+                <Setter Property="CornerRadius" Value="0" TargetName="PART_WindowRoot" />
+                <Setter Property="CornerRadius" Value="0" TargetName="WindowRootInnerBorder" />
+                <Setter Property="BorderBrush" Value="White" TargetName="ContentOuterBorder" />
+                <Setter Property="BorderBrush" Value="Black" TargetName="ContentBorder" />
+                <Setter Property="BorderThickness" Value="1" TargetName="ContentInnerBorder" />
+            </Trigger>
+
+            <Trigger Property="IsActive" Value="False">
+                <Setter Property="Background" Value="{Binding WindowInactiveBackground, RelativeSource={RelativeSource TemplatedParent}}" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FF666666" TargetName="PART_WindowRoot" />
+                <Setter Property="BorderBrush" Value="#FF7B7B7B" TargetName="ContentBorder" />
+            </Trigger>
+
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="KeyboardNavigation.TabNavigation" Value="Cycle" />
+            </Trigger>
+
+            <!-- #TODODOC-->
+            <!--Remove the Margin when no title to remove the TitleShadow glow effect.-->
+            <Trigger Property="Text" Value="" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+
+            <Trigger Property="Text" Value="{x:Null}" SourceName="TitleText">
+               <Setter Property="Margin" Value="0" TargetName="TitleText" />
+            </Trigger>
+      </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WindowControl}" >
+      <Setter Property="CloseButtonStyle" Value="{StaticResource {ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type local:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}}" />
+        <Setter Property="Background" Value="{StaticResource Window_Background}" />
+        <Setter Property="CaptionForeground" Value="{StaticResource Window_CaptionForeground}" />
+        <Setter Property="WindowBorderBrush" Value="{StaticResource Window_WindowBorderBrush}" />
+        <Setter Property="WindowBackground" Value="{StaticResource Window_WindowBackground}" />
+        <Setter Property="WindowBorderThickness" Value="{StaticResource Window_WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground" Value="{StaticResource Window_WindowInactiveBackground}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="KeyboardNavigation.TabNavigation" Value="None" />
+        <Setter Property="Template" Value="{StaticResource WindowControlTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
index 007861261..5e3fecfa4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/ResourceKeys.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
@@ -26,6 +26,7 @@ public static class ResourceKeys
     public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
     public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
     public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
+    public static readonly ResourceKey ControlSelectedBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey");
     public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
 
     public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
@@ -52,12 +53,9 @@ public static class ResourceKeys
     public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
     public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
 
-
-
     public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
 
-
-
     public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
index 1627c4e4f..e7fb9b48d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Themes/StaticResourceKey.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
index f15280504..22eed4dff 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
index b7bedf241..f71cbffa3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index 5a70052da..7f9abf2e9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
index cfe2a0de5..7259fc1bc 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
index 8aa50a947..f77c43bc0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Runtime.InteropServices;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
index ede76b987..2a6c88cc3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
new file mode 100644
index 000000000..89ff8d8d9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
@@ -0,0 +1,98 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Media;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class FontUtilities
+  {
+    internal static IEnumerable<FontFamily> Families
+    {
+      get
+      {
+#if !VS2008
+        // Workaround for a WPF 4 bug.
+        foreach( FontFamily font in Fonts.SystemFontFamilies )
+        {
+          try
+          {
+            // In WPF 4, this will throw an exception.
+            var throwAcess = font.FamilyNames;
+          }
+          catch 
+          { 
+            // It throws. Go to the next font family.
+            continue;
+          }
+
+          // If it does not throw, return the font.
+          yield return font;
+        }
+#else
+      return Fonts.SystemFontFamilies;
+#endif
+      }
+    }
+
+    internal static IEnumerable<FontWeight> Weights
+    {
+      get
+      {
+        yield return FontWeights.Black;
+        yield return FontWeights.Bold;
+        yield return FontWeights.ExtraBlack;
+        yield return FontWeights.ExtraBold;
+        yield return FontWeights.ExtraLight;
+        yield return FontWeights.Light;
+        yield return FontWeights.Medium;
+        yield return FontWeights.Normal;
+        yield return FontWeights.SemiBold;
+        yield return FontWeights.Thin;
+      }
+    }
+
+    internal static IEnumerable<FontStyle> Styles
+    {
+      get
+      {
+        yield return FontStyles.Italic;
+        yield return FontStyles.Normal;
+      }
+    }
+
+    internal static IEnumerable<FontStretch> Stretches
+    {
+      get
+      {
+        yield return FontStretches.Condensed;
+        yield return FontStretches.Expanded;
+        yield return FontStretches.ExtraCondensed;
+        yield return FontStretches.ExtraExpanded;
+        yield return FontStretches.Normal;
+        yield return FontStretches.SemiCondensed;
+        yield return FontStretches.SemiExpanded;
+        yield return FontStretches.UltraCondensed;
+        yield return FontStretches.UltraExpanded;
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
new file mode 100644
index 000000000..bc54a7c62
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -0,0 +1,91 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal sealed class GeneralUtilities : DependencyObject
+  {
+    private GeneralUtilities() { }
+
+    #region StubValue attached property
+
+    internal static readonly DependencyProperty StubValueProperty = DependencyProperty.RegisterAttached(
+      "StubValue",
+      typeof( object ),
+      typeof( GeneralUtilities ),
+      new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
+
+    internal static object GetStubValue( DependencyObject obj )
+    {
+      return ( object )obj.GetValue( GeneralUtilities.StubValueProperty );
+    }
+
+    internal static void SetStubValue( DependencyObject obj, object value )
+    {
+      obj.SetValue( GeneralUtilities.StubValueProperty, value );
+    }
+
+    #endregion StubValue attached property
+
+    public static object GetPathValue( object sourceObject, string path )
+    {
+      var targetObj = new GeneralUtilities();
+      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, new Binding( path ) { Source = sourceObject } );
+      object value = GeneralUtilities.GetStubValue( targetObj );
+      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
+      return value;
+    }
+
+    public static object GetBindingValue( object sourceObject, Binding binding )
+    {
+      Binding bindingClone = new Binding()
+      {
+        BindsDirectlyToSource = binding.BindsDirectlyToSource,
+        Converter = binding.Converter,
+        ConverterCulture = binding.ConverterCulture,
+        ConverterParameter = binding.ConverterParameter,
+        FallbackValue = binding.FallbackValue,
+        Mode = BindingMode.OneTime, 
+        Path = binding.Path,
+        StringFormat = binding.StringFormat,
+        TargetNullValue = binding.TargetNullValue,
+        XPath = binding.XPath
+      };
+
+      bindingClone.Source = sourceObject;
+
+      var targetObj = new GeneralUtilities();
+      BindingOperations.SetBinding( targetObj, GeneralUtilities.StubValueProperty, bindingClone );
+      object value = GeneralUtilities.GetStubValue( targetObj );
+      BindingOperations.ClearBinding( targetObj, GeneralUtilities.StubValueProperty );
+      return value;
+    }
+
+    internal static bool CanConvertValue( object value, object targetType )
+    {
+      return ( ( value != null )
+              && ( !object.Equals( value.GetType(), targetType ) )
+              && ( !object.Equals( targetType, typeof( object ) ) ) );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
index c9fd87bbc..9ab3ee99d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
new file mode 100644
index 000000000..564108d04
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
@@ -0,0 +1,36 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class ListUtilities
+  {
+    internal static Type GetListItemType( Type listType )
+    {
+      Type iListOfT = listType.GetInterfaces().FirstOrDefault(
+        ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( IList<> ) );
+
+      return ( iListOfT != null )
+        ? iListOfT.GetGenericArguments()[ 0 ]
+        : null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs
deleted file mode 100644
index 39c04f844..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/NotifyPropertyChangedHelper.cs
+++ /dev/null
@@ -1,160 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Linq.Expressions;
-
-namespace Xceed.Wpf.Toolkit.Core.Utilities
-{
-  [DebuggerStepThrough]
-  internal sealed class NotifyPropertyChangedHelper
-  {
-    #region Constructor
-
-    internal NotifyPropertyChangedHelper(
-      INotifyPropertyChanged owner,
-      Action<string> notifyPropertyChangedDelegate )
-    {
-      if( owner == null )
-        throw new ArgumentNullException( "owner" );
-
-      if( notifyPropertyChangedDelegate == null )
-        throw new ArgumentNullException( "notifyPropertyChangedDelegate" );
-
-      m_owner = owner;
-      m_delegate = notifyPropertyChangedDelegate;
-    }
-
-    #endregion
-
-    internal static bool PropertyChanged( string propertyName, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      string target = e.PropertyName;
-      if( target == propertyName )
-        return true;
-
-      return ( !targetPropertyOnly )
-          && ( string.IsNullOrEmpty( target ) );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    internal static bool PropertyChanged<TOwner, TMember>(
-      Expression<Func<TOwner, TMember>> expression,
-      PropertyChangedEventArgs e,
-      bool targetPropertyOnly )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
-    }
-
-    internal void RaisePropertyChanged( string propertyName )
-    {
-      ReflectionHelper.ValidatePropertyName( m_owner, propertyName );
-
-      this.InvokeDelegate( propertyName );
-    }
-
-    internal void RaisePropertyChanged<TMember>( Expression<Func<TMember>> expression )
-    {
-      if( expression == null )
-        throw new ArgumentNullException( "expression" );
-
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      var propertyName = NotifyPropertyChangedHelper.GetPropertyName( body, m_owner.GetType() );
-
-      this.InvokeDelegate( propertyName );
-    }
-
-    internal void HandleReferenceChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue ) where TMember : class
-    {
-      if( localReference != newValue )
-      {
-        this.ExecutePropertyChanged( expression, ref localReference, newValue );
-      }
-    }
-
-    internal void HandleEqualityChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue )
-    {
-      if( !object.Equals( localReference, newValue ) )
-      {
-        this.ExecutePropertyChanged( expression, ref localReference, newValue );
-      }
-    }
-
-    private void ExecutePropertyChanged<TMember>( Expression<Func<TMember>> expression, ref TMember localReference, TMember newValue )
-    {
-      TMember oldValue = localReference;
-      localReference = newValue;
-      this.RaisePropertyChanged( expression );
-    }
-
-    internal static string GetPropertyName<TMember>( Expression<Func<TMember>> expression, Type ownerType )
-    {
-      var body = expression.Body as MemberExpression;
-      if( body == null )
-        throw new ArgumentException( "The expression must target a property or field.", "expression" );
-
-      return NotifyPropertyChangedHelper.GetPropertyName( body, ownerType );
-    }
-
-    private static bool PropertyChanged( MemberExpression expression, Type ownerType, PropertyChangedEventArgs e, bool targetPropertyOnly )
-    {
-      var propertyName = NotifyPropertyChangedHelper.GetPropertyName( expression, ownerType );
-
-      return NotifyPropertyChangedHelper.PropertyChanged( propertyName, e, targetPropertyOnly );
-    }
-
-    private static string GetPropertyName( MemberExpression expression, Type ownerType )
-    {
-      var targetType = expression.Expression.Type;
-      if( !targetType.IsAssignableFrom( ownerType ) )
-        throw new ArgumentException( "The expression must target a property or field on the appropriate owner.", "expression" );
-
-      return ReflectionHelper.GetPropertyOrFieldName( expression );
-    }
-
-    private void InvokeDelegate( string propertyName )
-    {
-      m_delegate.Invoke( propertyName );
-    }
-
-    #region Private Fields
-
-    private readonly INotifyPropertyChanged m_owner;
-    private readonly Action<string> m_delegate;
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
index 1b31faa45..613a3f09f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
new file mode 100644
index 000000000..510b47c0a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
@@ -0,0 +1,127 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Linq.Expressions;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal static class PropertyChangedExt
+  {
+    #region Notify Methods
+
+    public static void Notify<TMember>( 
+      this INotifyPropertyChanged sender,
+      PropertyChangedEventHandler handler, 
+      Expression<Func<TMember>> expression )
+    {
+      if( sender == null )
+        throw new ArgumentNullException( "sender" );
+
+      if( expression == null )
+        throw new ArgumentNullException( "expression" );
+
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      string propertyName = PropertyChangedExt.GetPropertyName( body, sender.GetType() );
+
+      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
+    }
+
+    public static void Notify( this INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
+    {
+      if( sender == null )
+        throw new ArgumentNullException( "sender" );
+
+      if( propertyName == null )
+        throw new ArgumentNullException( "propertyName" );
+
+      ReflectionHelper.ValidatePropertyName( sender, propertyName );
+
+      PropertyChangedExt.NotifyCore( sender, handler, propertyName );
+    }
+
+    private static void NotifyCore( INotifyPropertyChanged sender, PropertyChangedEventHandler handler, string propertyName )
+    {
+      if( handler != null )
+      {
+        handler( sender, new PropertyChangedEventArgs( propertyName ) );
+      }
+    }
+
+    #endregion
+
+    #region PropertyChanged Verification Methods
+
+    internal static bool PropertyChanged( string propertyName, PropertyChangedEventArgs e, bool targetPropertyOnly )
+    {
+      string target = e.PropertyName;
+      if( target == propertyName )
+        return true;
+
+      return ( !targetPropertyOnly )
+          && ( string.IsNullOrEmpty( target ) );
+    }
+
+    internal static bool PropertyChanged<TOwner, TMember>(
+      Expression<Func<TMember>> expression,
+      PropertyChangedEventArgs e,
+      bool targetPropertyOnly )
+    {
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
+    }
+
+    internal static bool PropertyChanged<TOwner, TMember>(
+      Expression<Func<TOwner, TMember>> expression,
+      PropertyChangedEventArgs e,
+      bool targetPropertyOnly )
+    {
+      var body = expression.Body as MemberExpression;
+      if( body == null )
+        throw new ArgumentException( "The expression must target a property or field.", "expression" );
+
+      return PropertyChangedExt.PropertyChanged( body, typeof( TOwner ), e, targetPropertyOnly );
+    }
+
+    private static bool PropertyChanged( MemberExpression expression, Type ownerType, PropertyChangedEventArgs e, bool targetPropertyOnly )
+    {
+      var propertyName = PropertyChangedExt.GetPropertyName( expression, ownerType );
+
+      return PropertyChangedExt.PropertyChanged( propertyName, e, targetPropertyOnly );
+    }
+
+    #endregion
+
+    private static string GetPropertyName( MemberExpression expression, Type ownerType )
+    {
+      var targetType = expression.Expression.Type;
+      if( !targetType.IsAssignableFrom( ownerType ) )
+        throw new ArgumentException( "The expression must target a property or field on the appropriate owner.", "expression" );
+
+      return ReflectionHelper.GetPropertyOrFieldName( expression );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
index 6fd42213c..028ad56a4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
index 8205d68a6..e4b4aa8cc 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -129,5 +129,11 @@ internal static bool TryGetPropertyOrFieldName<TMember>( Expression<Func<TMember
 
       return ReflectionHelper.TryGetPropertyOrFieldName( expression.Body as MemberExpression, out propertyOrFieldName );
     }
+
+    public static bool IsPublicInstanceProperty( Type type, string propertyName )
+    {
+      BindingFlags flags = ( System.Reflection.BindingFlags.Instance | System.Reflection.BindingFlags.FlattenHierarchy | System.Reflection.BindingFlags.Public );
+      return type.GetProperty( propertyName, flags ) != null;
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
index 10a3e148f..2b80831c2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.IO;
 using System.Reflection;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
index 260b46ffd..7467beb33 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
index 69cb32db1..bf01e59e1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
index be904cae8..28a1720e2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
index 245e3e1b3..0c67b3ba4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
index d30eefab3..b29d30d0c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
new file mode 100644
index 000000000..90f32750b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
@@ -0,0 +1,43 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class WeakEventListener<TArgs> : IWeakEventListener where TArgs : EventArgs
+  {
+    private Action<object,TArgs> _callback;
+
+    public WeakEventListener(Action<object,TArgs> callback)
+    {
+      if( callback == null )
+         throw new ArgumentNullException( "callback" );
+
+      _callback = callback;
+    }
+
+    public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
+    {
+      _callback(sender, (TArgs)e);
+      return true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
new file mode 100644
index 000000000..580cd09b2
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
@@ -0,0 +1,30 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Core.Utilities
+{
+  internal class WindowUtilities
+  {
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
new file mode 100644
index 000000000..c07e41865
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
@@ -0,0 +1,150 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Collections.Specialized;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.Core
+{
+  internal class WeakCollectionChangedWrapper : IList, ICollection, INotifyCollectionChanged
+  {
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _innerListListener;
+    private IList _innerList;
+
+    public WeakCollectionChangedWrapper( IList sourceList )
+    {
+      _innerList = sourceList;
+      var notifyList = _innerList as INotifyCollectionChanged;
+      if( notifyList != null )
+      {
+        _innerListListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( OnInnerCollectionChanged );
+        CollectionChangedEventManager.AddListener( notifyList, _innerListListener );
+      }
+    }
+
+    public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+    private void OnInnerCollectionChanged( object sender, NotifyCollectionChangedEventArgs args )
+    {
+      if( this.CollectionChanged != null )
+      {
+        this.CollectionChanged( this, args );
+      }
+    }
+
+    internal void ReleaseEvents()
+    {
+      if( _innerListListener != null )
+      {
+        CollectionChangedEventManager.RemoveListener( ( INotifyCollectionChanged )_innerList, _innerListListener );
+        _innerListListener = null;
+      }
+    }
+
+    #region IList Members
+
+    int IList.Add( object value )
+    {
+      return _innerList.Add( value );
+    }
+
+    void IList.Clear()
+    {
+      _innerList.Clear();
+    }
+
+    bool IList.Contains( object value )
+    {
+      return _innerList.Contains( value );
+    }
+
+    int IList.IndexOf( object value )
+    {
+      return _innerList.IndexOf( value );
+    }
+
+    void IList.Insert( int index, object value )
+    {
+      _innerList.Insert( index, value );
+    }
+
+    bool IList.IsFixedSize
+    {
+      get { return _innerList.IsFixedSize; }
+    }
+
+    bool IList.IsReadOnly
+    {
+      get { return _innerList.IsReadOnly; }
+    }
+
+    void IList.Remove( object value )
+    {
+      _innerList.Remove( value );
+    }
+
+    void IList.RemoveAt( int index )
+    {
+      _innerList.RemoveAt( index );
+    }
+
+    object IList.this[ int index ]
+    {
+      get { return _innerList[ index ]; }
+      set { _innerList[ index ] = value; }
+    }
+    #endregion
+
+    #region ICollection Members
+
+    void ICollection.CopyTo( Array array, int index )
+    {
+      _innerList.CopyTo( array, index );
+    }
+
+    int ICollection.Count
+    {
+      get { return _innerList.Count; }
+    }
+
+    bool ICollection.IsSynchronized
+    {
+      get { return _innerList.IsSynchronized; }
+    }
+
+    object ICollection.SyncRoot
+    {
+      get { return _innerList.SyncRoot; }
+    }
+
+    #endregion
+
+    #region IEnumerable Members
+
+    IEnumerator IEnumerable.GetEnumerator()
+    {
+      return _innerList.GetEnumerator();
+    }
+
+    #endregion
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index de921504f..02af1188f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -29,21 +29,41 @@ namespace Xceed.Wpf.Toolkit
 {
   [TemplatePart( Name = PART_Calendar, Type = typeof( Calendar ) )]
   [TemplatePart( Name = PART_Popup, Type = typeof( Popup ) )]
+  [TemplatePart( Name = PART_TimeUpDown, Type = typeof( TimePicker ) )]
   public class DateTimePicker : DateTimeUpDown
   {
     private const string PART_Calendar = "PART_Calendar";
     private const string PART_Popup = "PART_Popup";
+    private const string PART_TimeUpDown = "PART_TimeUpDown";
 
     #region Members
 
     private Calendar _calendar;
     private Popup _popup;
     private DateTime? _initialValue;
+    private TimePicker _timePicker;
 
     #endregion //Members
 
     #region Properties
 
+    #region AutoCloseCalendar
+
+    public static readonly DependencyProperty AutoCloseCalendarProperty = DependencyProperty.Register( "AutoCloseCalendar", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool AutoCloseCalendar
+    {
+      get
+      {
+        return ( bool )GetValue( AutoCloseCalendarProperty );
+      }
+      set
+      {
+        SetValue( AutoCloseCalendarProperty, value );
+      }
+    }
+
+    #endregion //AutoCloseCalendar
+
     #region IsOpen
 
     public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
@@ -189,12 +209,21 @@ public override void OnApplyTemplate()
         _calendar.SelectedDate = Value ?? null;
         _calendar.DisplayDate = Value ?? DateTime.Now;
       }
+
+      _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker;
     }
 
     protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
     {
       if( Mouse.Captured is CalendarItem )
+      {
         Mouse.Capture( null );
+
+        if( AutoCloseCalendar )
+        {
+          CloseDateTimePicker( true );
+        }
+      }
     }
 
     protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
@@ -239,18 +268,15 @@ private void OnKeyDown( object sender, KeyEventArgs e )
             CloseDateTimePicker( true );
             e.Handled = true;
           }
-          else if( e.Key == Key.Enter )
+          else
           {
-            CloseDateTimePicker( true );
-            e.Handled = true;
-          }
-          else if( e.Key == Key.Escape )
-          {
-            Value = _initialValue;
-            CloseDateTimePicker( true );
-            e.Handled = true;
+            this.ManageEnterEscapeKeys( e );
           }
         }
+        else if( _timePicker.IsKeyboardFocusWithin && !_timePicker.IsOpen && !e.Handled)
+        {
+          this.ManageEnterEscapeKeys( e );
+        }
       }
     }
 
@@ -267,8 +293,8 @@ private void Calendar_SelectedDatesChanged( object sender, SelectionChangedEvent
 
         if( ( Value != null ) && ( newDate != null ) && newDate.HasValue )
         {
-          // Only change the year, month and Day part of the value. Keep everything to the last "tick".
-          // No, "miliseconds" aren't precise enought. Use a mathematical sceme instead
+          // Only change the year, month, and day part of the value. Keep everything to the last "tick."
+          // "Milliseconds" aren't precise enough. Use a mathematical scheme instead.
           newDate = newDate.Value.Date + Value.Value.TimeOfDay;
         }
 
@@ -297,6 +323,27 @@ private void CloseDateTimePicker( bool isFocusOnTextBox )
         TextBox.Focus();
     }
 
+    private void ManageEnterEscapeKeys( KeyEventArgs e )
+    {
+      if( e.Key == Key.Enter )
+      {
+        this.CloseDateTimePicker( true );
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Escape )
+      {
+        // Avoid setting the "Value" property when no change has occurred.
+        // The original value may not be a local value. Setting
+        // it, even with the same value, will override a one-way binding.
+        if( !object.Equals( this.Value, _initialValue ) )
+        {
+          this.Value = _initialValue;
+        }
+        this.CloseDateTimePicker( true );
+        e.Handled = true;
+      }
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..2c413a7c8
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,166 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
+                    xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+									   RenderMouseOver="{TemplateBinding IsMouseOver}"
+									   RenderPressed="{TemplateBinding IsPressed}" />
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- DateTimePicker                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DateTimePicker}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+                    <Border>
+                        <Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <local:ButtonSpinner x:Name="PART_Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             BorderBrush="{TemplateBinding BorderBrush}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                                    <local:WatermarkTextBox x:Name="PART_TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                                </local:ButtonSpinner>
+                                <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                            </Grid>
+                            <Popup x:Name="PART_Popup" IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                                <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                                    <StackPanel>
+                                        <toolkit:Calendar x:Name="PART_Calendar" BorderThickness="0" />
+                                        <local:TimePicker x:Name="PART_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                                    </StackPanel>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
index ab7ffc3f4..2f7185421 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
@@ -24,7 +24,7 @@
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -120,8 +120,8 @@
                                                    Padding="0"
                                                    TextAlignment="{TemplateBinding TextAlignment}"
                                                    TextWrapping="NoWrap" 
-                                                   TabIndex="{TemplateBinding TabIndex}"
                                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   TabIndex="{TemplateBinding TabIndex}"
                                                    Watermark="{TemplateBinding Watermark}"
                                                    WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
                         </local:ButtonSpinner>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
index 678fcfa53..b5bba325d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
index 7304c3c1f..9f17e1459 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
index bd349878c..f8d78a859 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
index 234199a52..bc3b660e1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index 6fd55a4de..3f4347ec7 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -21,6 +21,8 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Data;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
+using System.Windows.Controls;
+using System.Linq;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -85,7 +87,7 @@ internal static bool IsFormatStringValid( object value )
     {
       try
       {
-        // Test the format string if it be used
+        // Test the format string if it is used.
         DateTime.MinValue.ToString( ( string )value, CultureInfo.CurrentCulture );
       }
       catch
@@ -130,13 +132,19 @@ public DateTimeUpDown()
 
     public override void OnApplyTemplate()
     {
-      if( TextBox != null )
-        TextBox.SelectionChanged -= TextBox_SelectionChanged;
+      if( this.TextBox != null )
+      {
+        this.TextBox.SelectionChanged -= this.TextBox_SelectionChanged;
+        this.TextBox.GotFocus -= new RoutedEventHandler( this.TextBox_GotFocus );
+      }
 
       base.OnApplyTemplate();
 
       if( TextBox != null )
-        TextBox.SelectionChanged += TextBox_SelectionChanged;
+      {
+        this.TextBox.SelectionChanged += this.TextBox_SelectionChanged;
+        this.TextBox.GotFocus += new RoutedEventHandler(this.TextBox_GotFocus);
+      }
     }
 
     protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
@@ -146,22 +154,31 @@ protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo
 
     protected override void OnIncrement()
     {
-      if( Value.HasValue )
-        UpdateDateTime( 1 );
-      else
-        Value = DefaultValue ?? DateTime.Now;
+      if( this.IsCurrentValueValid() )
+      {
+        if( Value.HasValue )
+          UpdateDateTime( 1 );
+        else
+          Value = DefaultValue ?? DateTime.Now;
+      }
     }
 
     protected override void OnDecrement()
     {
-      if( Value.HasValue )
-        UpdateDateTime( -1 );
-      else
-        Value = DefaultValue ?? DateTime.Now;
+      if( this.IsCurrentValueValid() )
+      {
+        if( Value.HasValue )
+          UpdateDateTime( -1 );
+        else
+          Value = DefaultValue ?? DateTime.Now;
+      }
     }
 
     protected override void OnPreviewKeyDown( KeyEventArgs e )
-    {
+    {      
+      int selectionStart = (_selectedDateTimeInfo != null) ? _selectedDateTimeInfo.StartPosition : 0;
+      int selectionLength = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.Length : 0;
+
       switch( e.Key )
       {
         case Key.Enter:
@@ -172,11 +189,56 @@ protected override void OnPreviewKeyDown( KeyEventArgs e )
               BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
               binding.UpdateSource();
               _fireSelectionChangedEvent = true;
-              e.Handled = true;
             }
             return;
           }
-        default:
+        case Key.Add:
+          if( this.AllowSpin && !this.IsReadOnly )
+          {
+            this.DoIncrement();
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.Subtract:
+          if( this.AllowSpin && !this.IsReadOnly )
+          {
+            this.DoDecrement();
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.OemSemicolon:
+          if( this.IsCurrentValueValid() && ( Keyboard.Modifiers == ModifierKeys.Shift ) )
+          {
+            this.PerformKeyboardSelection( selectionStart + selectionLength );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.OemPeriod:
+        case Key.OemComma:
+        case Key.OemQuotes:
+        case Key.OemMinus:
+        case Key.Divide:
+        case Key.Decimal: 
+        case Key.Right:
+          if( this.IsCurrentValueValid() )
+          {
+            this.PerformKeyboardSelection( selectionStart + selectionLength );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+        case Key.Left:
+          if( this.IsCurrentValueValid() )
+          {
+            this.PerformKeyboardSelection( selectionStart > 0 ? selectionStart - 1 : 0 );
+            e.Handled = true;
+          }
+          _fireSelectionChangedEvent = false;
+          break;
+         default:
           {
             _fireSelectionChangedEvent = false;
             break;
@@ -199,9 +261,8 @@ protected override void OnTextChanged( string previousValue, string currentValue
       if( string.IsNullOrEmpty( text ) )
         return null;
 
-      DateTime current = Value.HasValue ? Value.Value : DateTime.Parse( DateTime.Now.ToString(), CultureInfo.DateTimeFormat );
       DateTime result;
-      var success = DateTimeParser.TryParse( text, GetFormatString( Format ), current, CultureInfo, out result );
+      this.TryParseDateTime( text, out result );
 
       return result;
     }
@@ -233,7 +294,7 @@ protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
 
     #region Event Hanlders
 
-    void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
+    private void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
     {
       if( _fireSelectionChangedEvent )
         PerformMouseSelection();
@@ -241,10 +302,22 @@ void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
         _fireSelectionChangedEvent = true;
     }
 
+    private void TextBox_GotFocus( object sender, RoutedEventArgs e )
+    {
+      this.Select( this.GetDateTimeInfo( 0 ) );
+    }
+
     #endregion //Event Hanlders
 
     #region Methods
 
+    public void SelectAll()
+    {
+      _fireSelectionChangedEvent = false;
+      TextBox.SelectAll();
+      _fireSelectionChangedEvent = true;
+    }
+
     private void FormatUpdated()
     {
       InitializeDateTimeInfoList();
@@ -537,22 +610,88 @@ private void ParseValueIntoDateTimeInfo()
 
     private void PerformMouseSelection()
     {
-      _dateTimeInfoList.ForEach( info =>
+      this.Select( this.GetDateTimeInfo( TextBox.SelectionStart ) );
+    }
+
+    private void PerformKeyboardSelection( int nextSelectionStart )
+    {
+      this.TextBox.Focus();
+
+      this.CommitInput();
+
+      int selectedDateStartPosition = ( _selectedDateTimeInfo != null ) ? _selectedDateTimeInfo.StartPosition : 0;
+      int direction = nextSelectionStart - selectedDateStartPosition;
+      if( direction > 0 )
+      {
+        this.Select( this.GetNextDateTimeInfo( nextSelectionStart ) );
+      }
+      else
+      {
+        this.Select( this.GetPreviousDateTimeInfo( nextSelectionStart - 1) );
+      }
+    }
+
+    private DateTimeInfo GetDateTimeInfo( int selectionStart )
+    {
+      return _dateTimeInfoList.FirstOrDefault( (info) =>
+                              ( info.StartPosition <= selectionStart ) && ( selectionStart < ( info.StartPosition + info.Length ) ) );
+    }
+
+    private DateTimeInfo GetNextDateTimeInfo( int nextSelectionStart )
+    {
+      DateTimeInfo nextDateTimeInfo = this.GetDateTimeInfo( nextSelectionStart );
+      if( nextDateTimeInfo == null )
+      {
+        nextDateTimeInfo = _dateTimeInfoList.First();
+      }
+
+      DateTimeInfo initialDateTimeInfo = nextDateTimeInfo;
+
+      while( nextDateTimeInfo.Type == DateTimePart.Other )
       {
-        if( ( info.StartPosition <= TextBox.SelectionStart ) && ( TextBox.SelectionStart < ( info.StartPosition + info.Length ) ) )
+        nextDateTimeInfo = this.GetDateTimeInfo( nextDateTimeInfo.StartPosition + nextDateTimeInfo.Length );
+        if( nextDateTimeInfo == null )
         {
-          Select( info );
-          return;
+          nextDateTimeInfo = _dateTimeInfoList.First();
         }
-      } );
+        if( object.Equals( nextDateTimeInfo, initialDateTimeInfo ) )
+          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
+      }
+      return nextDateTimeInfo;
+    }
+
+    private DateTimeInfo GetPreviousDateTimeInfo( int previousSelectionStart )
+    {
+      DateTimeInfo previousDateTimeInfo = this.GetDateTimeInfo( previousSelectionStart );
+      if( previousDateTimeInfo == null )
+      {
+        previousDateTimeInfo = _dateTimeInfoList.Last();
+      }
+
+      DateTimeInfo initialDateTimeInfo = previousDateTimeInfo;
+
+      while( previousDateTimeInfo.Type == DateTimePart.Other )
+      {
+        previousDateTimeInfo = this.GetDateTimeInfo( previousDateTimeInfo.StartPosition - 1 );
+        if( previousDateTimeInfo == null )
+        {
+          previousDateTimeInfo = _dateTimeInfoList.Last();
+        }
+        if( object.Equals( previousDateTimeInfo, initialDateTimeInfo ) )
+          throw new InvalidOperationException( "Couldn't find a valid DateTimeInfo." );
+      }
+      return previousDateTimeInfo;
     }
 
     private void Select( DateTimeInfo info )
     {
-      _fireSelectionChangedEvent = false;
-      TextBox.Select( info.StartPosition, info.Length );
-      _fireSelectionChangedEvent = true;
-      _selectedDateTimeInfo = info;
+      if( info != null )
+      {
+        _fireSelectionChangedEvent = false;
+        TextBox.Select( info.StartPosition, info.Length );
+        _fireSelectionChangedEvent = true;
+        _selectedDateTimeInfo = info;
+      }
     }
 
     private string GetFormatString( DateTimeFormat dateTimeFormat )
@@ -580,7 +719,39 @@ private string GetFormatString( DateTimeFormat dateTimeFormat )
         case DateTimeFormat.YearMonth:
           return CultureInfo.DateTimeFormat.YearMonthPattern;
         case DateTimeFormat.Custom:
-          return FormatString;
+          {
+            switch( this.FormatString )
+            {
+              case "d":
+                return CultureInfo.DateTimeFormat.ShortDatePattern;
+              case "t":
+                return CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "T":
+                return CultureInfo.DateTimeFormat.LongTimePattern;
+              case "D":
+                return CultureInfo.DateTimeFormat.LongDatePattern;
+              case "f":
+                return CultureInfo.DateTimeFormat.LongDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "F":
+                return CultureInfo.DateTimeFormat.FullDateTimePattern;
+              case "g":
+                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.ShortTimePattern;
+              case "G":
+                return CultureInfo.DateTimeFormat.ShortDatePattern + " " + CultureInfo.DateTimeFormat.LongTimePattern;
+              case "m":
+                return CultureInfo.DateTimeFormat.MonthDayPattern;
+              case "y":
+                return CultureInfo.DateTimeFormat.YearMonthPattern;
+              case "r":
+                return CultureInfo.DateTimeFormat.RFC1123Pattern;
+              case "s":
+                return CultureInfo.DateTimeFormat.SortableDateTimePattern;
+              case "u":
+                return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
+              default:
+                return FormatString;
+            }
+          }
         default:
           throw new ArgumentException( "Not a supported format" );
       }
@@ -660,6 +831,31 @@ private void UpdateDateTime( int value )
       _fireSelectionChangedEvent = true;
     }
 
+    private bool TryParseDateTime( string text, out DateTime result )
+    {
+      bool isValid;
+
+      DateTime current = this.Value.HasValue ? this.Value.Value : DateTime.Parse( DateTime.Now.ToString(), this.CultureInfo.DateTimeFormat );
+      isValid = DateTimeParser.TryParse( text, this.GetFormatString( Format ), current, this.CultureInfo, out result );
+
+      if( !isValid && ( this.Format == DateTimeFormat.Custom ) )
+      {
+        isValid = DateTime.TryParseExact( text, this.GetFormatString( this.Format ), this.CultureInfo, DateTimeStyles.None, out result );
+      }
+
+      return isValid;
+    }
+
+    private bool IsCurrentValueValid()
+    {
+      DateTime result;
+
+      if( string.IsNullOrEmpty( this.TextBox.Text ) )
+        return true;
+
+      return this.TryParseDateTime( this.TextBox.Text, out result );
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..b400f1098
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,91 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+
+    <!-- =============================================================================== -->
+    <!-- DateTimeUpDown                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DateTimeUpDown}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+                    <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                    </local:ButtonSpinner>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                          <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                      </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
index 0579fb328..263490442 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
@@ -1,25 +1,26 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <!-- =============================================================================== -->
@@ -28,18 +29,20 @@
 
    <Style TargetType="{x:Type local:DateTimeUpDown}">
       <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
       <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Focusable" Value="False" />
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
       <Setter Property="HorizontalContentAlignment" Value="Right" />
       <Setter Property="TextAlignment" Value="Right" />
       <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="IsTabStop" Value="False" />
       <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
                <local:ButtonSpinner x:Name="PART_Spinner"
                                     IsTabStop="False"
                                     Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
                                     AllowSpin="{TemplateBinding AllowSpin}"
                                     ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
@@ -57,7 +60,7 @@
                                           IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
                                           MinWidth="20"
                                           AcceptsReturn="False"
-                                          Padding="0"
+                                          Padding="{TemplateBinding Padding}"
                                           TextAlignment="{TemplateBinding TextAlignment}"
                                           TextWrapping="NoWrap" 
                                           TabIndex="{TemplateBinding TabIndex}"
@@ -65,6 +68,11 @@
                                           Watermark="{TemplateBinding Watermark}"
                                           WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
                </local:ButtonSpinner>
+                 <ControlTemplate.Triggers>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                   </Trigger>
+               </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index 7d68f5ce4..b96f148f0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
@@ -249,21 +249,10 @@ void CanExecuteChanged( object sender, EventArgs e )
 
     private void Popup_Opened( object sender, EventArgs e )
     {
-      // Set the focus on the content of the ContentPresenter
+      // Set the focus on the content of the ContentPresenter.
       if( _contentPresenter != null )
       {
-        DependencyObject o = _contentPresenter.Content as DependencyObject;
-        while( o != null && ( VisualTreeHelper.GetChildrenCount(o) > 0 ) )
-        {
-          if( o is UIElement )
-          {
-            if( ( ( UIElement )o ).Focusable )
-              break;
-          }
-          o = VisualTreeHelper.GetChild( o, 0 );
-        }
-
-        ( ( UIElement )o ).Focus();
+        _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..9c51e99c0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,98 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- DropDownButton                                                                  -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:DropDownButton}">
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                        <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                            <ToggleButton.Template>
+                                <ControlTemplate TargetType="ToggleButton">
+                                    <ContentPresenter />
+                                </ControlTemplate>
+                            </ToggleButton.Template>
+                            <Grid>
+                                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                     RenderChecked="{TemplateBinding IsOpen}"
+                                                     RenderEnabled="{TemplateBinding IsEnabled}"
+											         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											         RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                            <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                        </Grid>
+                                    </Grid>
+                                </chrome:ButtonChrome>
+                            </Grid>
+                        </ToggleButton>
+
+                        <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding DropDownContent}" />
+                            </Border>
+                        </Popup>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="ToggleButtonChrome" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index 35d83f182..52d36a5d9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
deleted file mode 100644
index b62d2e328..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.Windows;
-using System.Windows.Data;
-
-namespace Xceed.Wpf.Toolkit.Mag.Converters
-{
-  internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
-  {
-    #region IValueConverter Members
-
-    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      Thickness thickness = ( Thickness )value;
-      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
-    }
-
-    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
-    {
-      throw new NotImplementedException();
-    }
-
-    #endregion
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
index 218367a25..3df55cdc3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
index 911645136..cd1bfa2cf 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index 27ea57586..07ecca258 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index f4a0df81f..4535b4e9a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Documents;
@@ -75,9 +75,9 @@ private Point CalculateViewBoxLocation()
       offsetX = element.X - adorner.X;
       offsetY = element.Y - adorner.Y;
 
-      //An element will use the offset from its parent (StackPanel, Grid...) to be rendered.
-      //When this element is put in a VisualBrush, then the element will draw with that offset applied. 
-      //To fix this : we add that parent offset to Magnifier location.
+      //An element will use the offset from its parent (StackPanel, Grid, etc.) to be rendered.
+      //When this element is put in a VisualBrush, the element will draw with that offset applied. 
+      //To fix this: we add that parent offset to Magnifier location.
       Vector parentOffsetVector = VisualTreeHelper.GetOffset( _magnifier.Target );
       Point parentOffset = new Point( parentOffsetVector.X, parentOffsetVector.Y );
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index d2ab5339d..2af25cbff 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
index 05a3c616f..5bad5932a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
@@ -1,30 +1,31 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters">
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Mag.Converters"
+                    xmlns:coreconv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
    <!-- =============================================================================== -->
    <!-- Magnifier                                                                       -->
    <!-- =============================================================================== -->
 
    <conv:RadiusConverter x:Key="RadiusConverter" />
-   <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+   <coreconv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
 
    <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
       <Grid>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
index 90481f60b..7e5825010 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
index ecd67644e..a8cbe8fd0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
index 7472f0c67..6114a0cd2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index 44b3f8a20..6f068c54f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
index b824cf21a..d236101f6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -23,6 +23,9 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Text;
 using System.Security.Permissions;
 using System.Security;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
+using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -30,19 +33,19 @@ namespace Xceed.Wpf.Toolkit
   [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
   [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
   [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
-  [TemplatePart( Name = PART_DragWidget, Type = typeof( Thumb ) )]
   [TemplatePart( Name = PART_CancelButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_NoButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_OkButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_YesButton, Type = typeof( Button ) )]
-  public class MessageBox : Control
+  [TemplatePart( Name = PART_WindowControl, Type = typeof( WindowControl ) )]
+  public class MessageBox : WindowControl
   {
-    private const string PART_DragWidget = "PART_DragWidget";
     private const string PART_CancelButton = "PART_CancelButton";
     private const string PART_NoButton = "PART_NoButton";
     private const string PART_OkButton = "PART_OkButton";
     private const string PART_YesButton = "PART_YesButton";
     private const string PART_CloseButton = "PART_CloseButton";
+    private const string PART_WindowControl = "PART_WindowControl";
 
     #region Private Members
 
@@ -56,11 +59,18 @@ public class MessageBox : Control
     /// </summary>
     private MessageBoxResult _defaultResult = MessageBoxResult.None;
 
+    /// <summary>
+    /// Will contain the result when the messagebox is shown inside a WindowContainer
+    /// </summary>
+    private MessageBoxResult _dialogResult = MessageBoxResult.None;
+
     /// <summary>
     /// Tracks the owner of the MessageBox
     /// </summary>
     private Window _owner;
 
+    private WindowControl _windowControl;
+
     #endregion //Private Members
 
     #region Constructors
@@ -70,12 +80,10 @@ static MessageBox()
       DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
     }
 
-    internal MessageBox()
+    public MessageBox()
     {
-      /*user cannot create instance */
-      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( Button_Click ) );
-
-      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, new ExecutedRoutedEventHandler( ExecuteCopy ) ) );
+      this.Visibility = Visibility.Collapsed;
+      this.InitHandlers();
     }
 
     #endregion //Constructors
@@ -84,52 +92,34 @@ internal MessageBox()
 
     #region Protected Properties
 
-    /// <summary>
-    /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
-    /// </summary>
-    protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
-
     protected Window Container
     {
-      get;
-      private set;
-    }
-    protected Thumb DragWidget
-    {
-      get;
-      private set;
+      get { return ( this.Parent as Window ); }
     }
 
     #endregion //Protected Properties
 
     #region Dependency Properties
 
-    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
-    public string Caption
-    {
-      get
-      {
-        return ( string )GetValue( CaptionProperty );
-      }
-      set
-      {
-        SetValue( CaptionProperty, value );
-      }
-    }
+    #region ButtonRegionBackground
 
-    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( MessageBox ), new UIPropertyMetadata( null ) );
-    public Brush CaptionForeground
+    public static readonly DependencyProperty ButtonRegionBackgroundProperty = DependencyProperty.Register( "ButtonRegionBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush ButtonRegionBackground
     {
       get
       {
-        return ( Brush )GetValue( CaptionForegroundProperty );
+        return ( Brush )GetValue( ButtonRegionBackgroundProperty );
       }
       set
       {
-        SetValue( CaptionForegroundProperty, value );
+        SetValue( ButtonRegionBackgroundProperty, value );
       }
     }
 
+    #endregion //ButtonRegionBackground
+
+    #region CancelButtonContent
+
     public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
     public object CancelButtonContent
     {
@@ -143,44 +133,9 @@ public object CancelButtonContent
       }
     }
 
-    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style CloseButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( CloseButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( CloseButtonStyleProperty, value );
-      }
-    }
+    #endregion //CancelButtonContent
 
-    public static readonly DependencyProperty ButtonRegionBackgroundProperty = DependencyProperty.Register( "ButtonRegionBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush ButtonRegionBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( ButtonRegionBackgroundProperty );
-      }
-      set
-      {
-        SetValue( ButtonRegionBackgroundProperty, value );
-      }
-    }
-
-    public static readonly DependencyProperty OkButtonStyleProperty = DependencyProperty.Register( "OkButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style OkButtonStyle
-    {
-      get
-      {
-        return ( Style )GetValue( OkButtonStyleProperty );
-      }
-      set
-      {
-        SetValue( OkButtonStyleProperty, value );
-      }
-    }
+    #region CancelButtonStyle
 
     public static readonly DependencyProperty CancelButtonStyleProperty = DependencyProperty.Register( "CancelButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
     public Style CancelButtonStyle
@@ -195,45 +150,73 @@ public Style CancelButtonStyle
       }
     }
 
-    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style YesButtonStyle
+    #endregion //CancelButtonStyle
+
+    #region ImageSource
+
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
+    public ImageSource ImageSource
     {
       get
       {
-        return ( Style )GetValue( YesButtonStyleProperty );
+        return ( ImageSource )GetValue( ImageSourceProperty );
       }
       set
       {
-        SetValue( YesButtonStyleProperty, value );
+        SetValue( ImageSourceProperty, value );
       }
     }
 
-    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Style NoButtonStyle
+    #endregion //ImageSource
+
+    #region OkButtonContent
+
+    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
+    public object OkButtonContent
     {
       get
       {
-        return ( Style )GetValue( NoButtonStyleProperty );
+        return ( object )GetValue( OkButtonContentProperty );
       }
       set
       {
-        SetValue( NoButtonStyleProperty, value );
+        SetValue( OkButtonContentProperty, value );
       }
     }
 
-    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
-    public ImageSource ImageSource
+    #endregion //OkButtonContent
+
+    #region OkButtonStyle
+
+    public static readonly DependencyProperty OkButtonStyleProperty = DependencyProperty.Register( "OkButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style OkButtonStyle
     {
       get
       {
-        return ( ImageSource )GetValue( ImageSourceProperty );
+        return ( Style )GetValue( OkButtonStyleProperty );
       }
       set
       {
-        SetValue( ImageSourceProperty, value );
+        SetValue( OkButtonStyleProperty, value );
       }
     }
 
+    #endregion //OkButtonStyle
+
+    #region MessageBoxResult
+
+    /// <summary>
+    /// Gets the MessageBox result, which is set when the "Closed" event is raised.
+    /// </summary>
+    public MessageBoxResult MessageBoxResult
+    {
+      get { return _dialogResult; }
+    }
+
+    #endregion //MessageBoxResult
+
+    #region NoButtonContent
+
     public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
     public object NoButtonContent
     {
@@ -247,19 +230,27 @@ public object NoButtonContent
       }
     }
 
-    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
-    public object OkButtonContent
+    #endregion //NoButtonContent
+
+    #region NoButtonStyle
+
+    public static readonly DependencyProperty NoButtonStyleProperty = DependencyProperty.Register( "NoButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style NoButtonStyle
     {
       get
       {
-        return ( object )GetValue( OkButtonContentProperty );
+        return ( Style )GetValue( NoButtonStyleProperty );
       }
       set
       {
-        SetValue( OkButtonContentProperty, value );
+        SetValue( NoButtonStyleProperty, value );
       }
     }
 
+    #endregion //NoButtonStyle
+
+    #region Text
+
     public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
     public string Text
     {
@@ -273,64 +264,53 @@ public string Text
       }
     }
 
-    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush WindowBackground
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBackgroundProperty );
-      }
-      set
-      {
-        SetValue( WindowBackgroundProperty, value );
-      }
-    }
+    #endregion //Text
 
-    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public Brush WindowBorderBrush
-    {
-      get
-      {
-        return ( Brush )GetValue( WindowBorderBrushProperty );
-      }
-      set
-      {
-        SetValue( WindowBorderBrushProperty, value );
-      }
-    }
+    #region YesButtonContent
 
-    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( MessageBox ), new PropertyMetadata( null ) );
-    public double WindowOpacity
+    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
+    public object YesButtonContent
     {
       get
       {
-        return ( double )GetValue( WindowOpacityProperty );
+        return ( object )GetValue( YesButtonContentProperty );
       }
       set
       {
-        SetValue( WindowOpacityProperty, value );
+        SetValue( YesButtonContentProperty, value );
       }
     }
 
-    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
-    public object YesButtonContent
+    #endregion //YesButtonContent
+
+    #region YesButtonStyle
+
+    public static readonly DependencyProperty YesButtonStyleProperty = DependencyProperty.Register( "YesButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style YesButtonStyle
     {
       get
       {
-        return ( object )GetValue( YesButtonContentProperty );
+        return ( Style )GetValue( YesButtonStyleProperty );
       }
       set
       {
-        SetValue( YesButtonContentProperty, value );
+        SetValue( YesButtonStyleProperty, value );
       }
     }
 
+    #endregion //YesButtonStyle
+
     #endregion //Dependency Properties
 
     #endregion //Properties
 
     #region Base Class Overrides
 
+    internal override bool AllowPublicIsActiveChange
+    {
+      get { return false; }
+    }
+
     /// <summary>
     /// Overrides the OnApplyTemplate method.
     /// </summary>
@@ -338,13 +318,20 @@ public override void OnApplyTemplate()
     {
       base.OnApplyTemplate();
 
-      if( DragWidget != null )
-        DragWidget.DragDelta -= ( o, e ) => ProcessMove( e );
-
-      DragWidget = GetTemplateChild( PART_DragWidget ) as Thumb;
-
-      if( DragWidget != null )
-        DragWidget.DragDelta += ( o, e ) => ProcessMove( e );
+      if( _windowControl != null )
+      {
+        _windowControl.HeaderDragDelta -= ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked -= ( o, e ) => this.OnHeaderIconDoubleClicked( e );
+        _windowControl.CloseButtonClicked -= ( o, e ) => this.OnCloseButtonClicked( e );
+      }
+      _windowControl = this.GetTemplateChild( PART_WindowControl ) as WindowControl;
+      if( _windowControl != null )
+      {
+        _windowControl.HeaderDragDelta += ( o, e ) => this.OnHeaderDragDelta( e );
+        _windowControl.HeaderIconDoubleClicked += ( o, e ) => this.OnHeaderIconDoubleClicked( e );
+        _windowControl.CloseButtonClicked += ( o, e ) => this.OnCloseButtonClicked( e );
+      }
+      this.UpdateBlockMouseInputsPanel();
 
       ChangeVisualState( _button.ToString(), true );
 
@@ -359,6 +346,29 @@ public override void OnApplyTemplate()
       SetDefaultResult();
     }
 
+    protected override object OnCoerceCloseButtonVisibility( Visibility newValue )
+    {
+      if( newValue != Visibility.Visible )
+        throw new InvalidOperationException( "Close button on MessageBox is always Visible." );
+      return newValue;
+    }
+
+    protected override object OnCoerceWindowStyle( WindowStyle newValue )
+    {
+      if( newValue != WindowStyle.SingleBorderWindow )
+        throw new InvalidOperationException( "Window style on MessageBox is not available." );
+      return newValue;
+    }
+
+    internal override void UpdateBlockMouseInputsPanel()
+    {
+      if( _windowControl != null )
+      {
+        _windowControl.IsBlockMouseInputsPanelActive = this.IsBlockMouseInputsPanelActive;
+      }
+    }
+
+
     #endregion //Base Class Overrides
 
     #region Methods
@@ -502,16 +512,89 @@ public static MessageBoxResult Show( Window owner, string messageText, string ca
 
     #endregion //Public Static
 
-    #region Protected
+    #region Public Methods
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox()
+    {
+      if( this.Container != null || this.Parent == null )
+        throw new InvalidOperationException(
+          "This method is not intended to be called while displaying a MessageBox outside of a WindowContainer. Use ShowDialog() instead in that case." );
+
+      if( !( this.Parent is WindowContainer ) )
+        throw new InvalidOperationException(
+          "The MessageBox instance is not intended to be displayed in a container other than a WindowContainer." );
+
+      _dialogResult = System.Windows.MessageBoxResult.None;
+      this.Visibility = Visibility.Visible;
+    }
 
     /// <summary>
-    /// Shows the container which contains the MessageBox.
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
     /// </summary>
-    protected void Show()
+    public void ShowMessageBox( string messageText )
     {
-      Container.ShowDialog();
+      this.ShowMessageBoxCore( messageText, string.Empty, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
     }
 
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption )
+    {
+      this.ShowMessageBoxCore( messageText, caption, MessageBoxButton.OK, MessageBoxImage.None, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, icon, MessageBoxResult.None );
+    }
+
+    /// <summary>
+    /// Displays this message box when embedded in a WindowContainer parent.
+    /// Note that this call is not blocking and that you must register to the Closed event in order to handle the dialog result, if any.
+    /// </summary>
+    public void ShowMessageBox( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      this.ShowMessageBoxCore( messageText, caption, button, icon, defaultResult );
+    }
+
+    /// <summary>
+    /// Display the MessageBox window and returns only when this MessageBox closes.
+    /// </summary>
+    public bool? ShowDialog()
+    {
+      if( this.Parent != null )
+        throw new InvalidOperationException(
+          "This method is not intended to be called while displaying a Message Box inside a WindowContainer. Use 'ShowMessageBox()' instead." );
+
+      _dialogResult = System.Windows.MessageBoxResult.None;
+      this.Visibility = Visibility.Visible;
+      this.CreateContainer();
+
+      return this.Container.ShowDialog();
+    }
+
+    #endregion
+
+    #region Protected
     /// <summary>
     /// Initializes the MessageBox.
     /// </summary>
@@ -527,7 +610,6 @@ protected void InitializeMessageBox( Window owner, string text, string caption,
       _defaultResult = defaultResult;
       _owner = owner;
       SetImageSource( image );
-      Container = CreateContainer();
     }
 
     /// <summary>
@@ -542,8 +624,33 @@ protected void ChangeVisualState( string name, bool useTransitions )
 
     #endregion //Protected
 
+
+
+
+
     #region Private
 
+    private bool IsCurrentWindow( object windowtoTest )
+    {
+      return object.Equals( _windowControl, windowtoTest );
+    }
+
+    /// <summary>
+    /// Closes the MessageBox.
+    /// </summary>
+    private void Close()
+    {
+      if( this.Container != null )
+      {
+        // The Window.Closed event callback will call "OnClose"
+        this.Container.Close();
+      }
+      else
+      {
+        this.OnClose();
+      }
+    }
+
     /// <summary>
     /// Sets the button that represents the _defaultResult to the default button and gives it focus.
     /// </summary>
@@ -618,6 +725,19 @@ private Button GetMessageBoxButton( string name )
       return button;
     }
 
+    private void ShowMessageBoxCore( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      this.InitializeMessageBox( null, messageText, caption, button, icon, defaultResult );
+      this.ShowMessageBox();
+    }
+
+    private void InitHandlers()
+    {
+      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( this.Button_Click ) );
+
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Copy, new ExecutedRoutedEventHandler( ExecuteCopy ) ) );
+    }
+
     /// <summary>
     /// Shows the MessageBox.
     /// </summary>
@@ -629,6 +749,11 @@ private Button GetMessageBoxButton( string name )
     /// <returns></returns>
     private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult, Style messageBoxStyle )
     {
+      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      {
+        throw new InvalidOperationException( "Static methods for MessageBoxes are not available in XBAP. Use the instance ShowMessageBox methods instead." );
+      }
+
       MessageBox msgBox = new MessageBox();
       msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
 
@@ -638,7 +763,7 @@ private static MessageBoxResult ShowCore( Window owner, string messageText, stri
         msgBox.Style = messageBoxStyle;
       }
 
-      msgBox.Show();
+      msgBox.ShowDialog();
       return msgBox.MessageBoxResult;
     }
 
@@ -700,7 +825,7 @@ private void SetImageSource( MessageBoxImage image )
           }
       }
 
-      ImageSource = ( ImageSource )new ImageSourceConverter().ConvertFromString( String.Format( "pack://application:,,,/Xceed.Wpf.Toolkit;component/MessageBox/Icons/{0}", iconName ) );
+      this.ImageSource = new BitmapImage( new Uri( String.Format("../Icons/{0}", iconName), UriKind.Relative ) );
     }
 
     /// <summary>
@@ -724,6 +849,7 @@ private Window CreateContainer()
       newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
       newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
       newWindow.WindowStyle = System.Windows.WindowStyle.None;
+      newWindow.Closed += new EventHandler( OnContainerClosed );
       return newWindow;
     }
 
@@ -737,17 +863,91 @@ private Window CreateContainer()
     /// Processes the move of a drag operation on the header.
     /// </summary>
     /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
-    private void ProcessMove( DragDeltaEventArgs e )
+    protected virtual void OnHeaderDragDelta( DragDeltaEventArgs e )
     {
-      double left = 0.0;
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
 
-      if( FlowDirection == System.Windows.FlowDirection.RightToLeft )
-        left = Container.Left - e.HorizontalChange;
-      else
-        left = Container.Left + e.HorizontalChange;
+      e.Handled = true;
+
+      DragDeltaEventArgs args = new DragDeltaEventArgs( e.HorizontalChange, e.VerticalChange );
+      args.RoutedEvent = HeaderDragDeltaEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        if( this.Container == null )
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
+            left = this.Left - e.HorizontalChange;
+          else
+            left = this.Left + e.HorizontalChange;
+
+          this.Left = left;
+          this.Top += e.VerticalChange;
+        }
+        else
+        {
+          double left = 0.0;
+
+          if( this.FlowDirection == System.Windows.FlowDirection.RightToLeft )
+            left = Container.Left - e.HorizontalChange;
+          else
+            left = Container.Left + e.HorizontalChange;
+
+          Container.Left = left;
+          Container.Top += e.VerticalChange;
+        }
+      }
+    }
+
+    /// <summary>
+    /// Processes the double-click on the header.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.Input.Primitives.MouseButtonEventArgs"/> instance containing the event data.</param>
+    protected virtual void OnHeaderIconDoubleClicked( MouseButtonEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
 
-      Container.Left = left;
-      Container.Top = Container.Top + e.VerticalChange;
+      MouseButtonEventArgs args = new MouseButtonEventArgs( Mouse.PrimaryDevice, 0, MouseButton.Left );
+      args.RoutedEvent = HeaderIconDoubleClickedEvent;
+      args.Source = this;
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
+      }
+    }
+
+    /// <summary>
+    /// Processes the close button click.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
+    protected virtual void OnCloseButtonClicked( RoutedEventArgs e )
+    {
+      if( !this.IsCurrentWindow( e.OriginalSource ) )
+        return;
+
+      e.Handled = true;
+
+      _dialogResult = object.Equals( _button, MessageBoxButton.OK )
+                             ? MessageBoxResult.OK
+                             : MessageBoxResult.Cancel;
+
+      RoutedEventArgs args = new RoutedEventArgs( CloseButtonClickedEvent, this );
+      this.RaiseEvent( args );
+
+      if( !args.Handled )
+      {
+        this.Close();
+      }
     }
 
     /// <summary>
@@ -765,39 +965,62 @@ private void Button_Click( object sender, RoutedEventArgs e )
       switch( button.Name )
       {
         case PART_NoButton:
-          MessageBoxResult = MessageBoxResult.No;
+          _dialogResult = MessageBoxResult.No;
+          this.Close();
           break;
         case PART_YesButton:
-          MessageBoxResult = MessageBoxResult.Yes;
-          break;
-        case PART_CloseButton:
-          MessageBoxResult = object.Equals( _button, MessageBoxButton.OK )
-                              ? MessageBoxResult.OK
-                              : MessageBoxResult.Cancel;
+          _dialogResult = MessageBoxResult.Yes;
+          this.Close();
           break;
         case PART_CancelButton:
-          MessageBoxResult = MessageBoxResult.Cancel;
+          _dialogResult = MessageBoxResult.Cancel;
+          this.Close();
           break;
         case PART_OkButton:
-          MessageBoxResult = MessageBoxResult.OK;
+          _dialogResult = MessageBoxResult.OK;
+          this.Close();
           break;
       }
 
       e.Handled = true;
-
-      Close();
     }
 
     /// <summary>
-    /// Closes the MessageBox.
+    /// Callack to the Container.Closed event
     /// </summary>
-    private void Close()
+    /// <param name="sender"></param>
+    /// <param name="e"></param>
+    private void OnContainerClosed( object sender, EventArgs e )
+    {
+      this.Container.Closed -= this.OnContainerClosed;
+      this.Container.Content = null;
+      Debug.Assert( this.Container == null );
+      this.OnClose();
+    }
+
+    private void OnClose()
     {
-      Container.Close();
+      this.Visibility = Visibility.Collapsed;
+      this.OnClosed( EventArgs.Empty );
     }
 
     #endregion //Event Handlers
 
+    #region Events
+
+    /// <summary>
+    /// Occurs when the MessageBox is closed.
+    /// </summary>
+    public event EventHandler Closed;
+    protected virtual void OnClosed( EventArgs e )
+    {
+      if( Closed != null )
+        Closed( this, e );
+    }
+
+
+    #endregion
+
     #region COMMANDS
 
     private void ExecuteCopy( object sender, ExecutedRoutedEventArgs e )
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
index 6b6d520ed..56b914132 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..cb81d8be4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,192 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+        <ResourceDictionary Source="../../Core/Themes/Aero2/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- MessageBox                                                                      -->
+    <!-- =============================================================================== -->
+
+    <ControlTemplate x:Key="MessageBoxTemplate" TargetType="{x:Type local:MessageBox}">
+        <Grid>
+            <VisualStateManager.VisualStateGroups>
+                <VisualStateGroup x:Name="group1">
+                    <VisualState x:Name="OK">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="OKCancel">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="YesNo">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                    <VisualState x:Name="YesNoCancel">
+                        <Storyboard>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                            <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                        <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                </DiscreteObjectKeyFrame>
+                            </ObjectAnimationUsingKeyFrames>
+                        </Storyboard>
+                    </VisualState>
+                </VisualStateGroup>
+            </VisualStateManager.VisualStateGroups>
+
+            <prim:WindowControl x:Name="PART_WindowControl"
+                                    Caption="{TemplateBinding Caption}" 
+                                    CaptionForeground="{TemplateBinding CaptionForeground}"
+                                    CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                                    CaptionIcon="{TemplateBinding CaptionIcon}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    IsActive="{TemplateBinding IsActive}"
+                                    WindowBackground="{TemplateBinding WindowBackground}"
+                                    WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                    WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                    WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                    CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                                    WindowOpacity="{TemplateBinding WindowOpacity}">
+                <prim:WindowControl.Content>
+                    <Grid MinWidth="350">
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Grid Margin="24,16,24,22">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+
+                            <!-- Message Image -->
+                            <Image x:Name="MessageBoxImage" 
+                                       VerticalAlignment="Top" 
+                                       SnapsToDevicePixels="True" 
+                                       Stretch="None"
+                                       Source="{TemplateBinding ImageSource}" />
+
+                            <!-- Message Text -->
+                            <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                <TextBlock x:Name="MessageText" 
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center" 
+                                               MaxWidth="450" 
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}" 
+                                               FontSize="{TemplateBinding FontSize}" 
+                                               FontStyle="{TemplateBinding FontStyle}" 
+                                               FontWeight="{TemplateBinding FontWeight}" 
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Margin="10,0,0,0"/>
+                            </ScrollViewer>
+                        </Grid>
+
+                        <!-- Buttons -->
+                        <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}">
+                            <Grid HorizontalAlignment="Right" Margin="12">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}" />
+                                <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}" />
+                                <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}" />
+                                <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" Style="{TemplateBinding CancelButtonStyle}" IsCancel="True" />
+                            </Grid>
+                        </Border>
+                    </Grid>
+                </prim:WindowControl.Content>
+            </prim:WindowControl>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:MessageBox}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="MinWidth" Value="350" />
+        <Setter Property="MinHeight" Value="50" />
+        <Setter Property="MaxHeight" Value="250" />
+        <Setter Property="Template" Value="{StaticResource MessageBoxTemplate}" />
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
index 969f5258d..abfcdba5f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
@@ -1,282 +1,173 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Disabled">
-                            <Storyboard>
-                                <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".3"/>
-                                <DoubleAnimation Duration="0" Storyboard.TargetName="Background" Storyboard.TargetProperty="Opacity" To=".3"/>
-                            </Storyboard>
-                        </VisualState>
-                    </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
-   </Style>
+    <ResourceDictionary.MergedDictionaries>
+         <ResourceDictionary Source="../../Themes/Generic/Common.xaml" />
+         <ResourceDictionary Source="../../Core/Themes/Generic/WindowControl.xaml" />
+    </ResourceDictionary.MergedDictionaries>
 
    <!-- =============================================================================== -->
    <!-- MessageBox                                                                      -->
    <!-- =============================================================================== -->
 
-   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
-      <Border Background="Transparent" />
-   </ControlTemplate>
-
-   <Style TargetType="{x:Type local:MessageBox}">
-      <Setter Property="Background" Value="#FFFFFFFF" />
-      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="CaptionForeground" Value="#FF000000" />
-      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-      <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
-      <Setter Property="Focusable" Value="False" />
-      <Setter Property="HorizontalAlignment" Value="Left" />
-      <Setter Property="HorizontalContentAlignment" Value="Left" />
-      <Setter Property="IsEnabled" Value="true" />
-      <Setter Property="MinWidth" Value="350" />
-      <Setter Property="MinHeight" Value="50" />
-      <Setter Property="MaxHeight" Value="250" />
-      <Setter Property="VerticalAlignment" Value="Top" />
-      <Setter Property="VerticalContentAlignment" Value="Top" />
-      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-      <Setter Property="WindowOpacity" Value="1.0" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type local:MessageBox}">
-               <Grid x:Name="Root">
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="group1">
+    <Style TargetType="{x:Type local:MessageBox}" BasedOn="{StaticResource {x:Type prim:WindowControl}}">
+        <Setter Property="ButtonRegionBackground" Value="#FFF0F0F0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="MinWidth" Value="350" />
+        <Setter Property="MinHeight" Value="50" />
+        <Setter Property="MaxHeight" Value="250" />
+        <Setter Property="Template">
+        <Setter.Value>
+          <ControlTemplate TargetType="{x:Type local:MessageBox}">
+             <Grid>
+                <VisualStateManager.VisualStateGroups>
+                    <VisualStateGroup x:Name="group1">
                         <VisualState x:Name="OK">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
                         <VisualState x:Name="OKCancel">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
                         <VisualState x:Name="YesNo">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
-
                         <VisualState x:Name="YesNoCancel">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                            <Storyboard>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                    <DiscreteObjectKeyFrame KeyTime="0">
                                     <DiscreteObjectKeyFrame.Value>
-                                       <Visibility>Visible</Visibility>
+                                        <Visibility>Visible</Visibility>
                                     </DiscreteObjectKeyFrame.Value>
-                                 </DiscreteObjectKeyFrame>
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
+                                    </DiscreteObjectKeyFrame>
+                                </ObjectAnimationUsingKeyFrames>
+                            </Storyboard>
                         </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-
-                  <!-- Borders -->
-                  <Grid  x:Name="MessageBoxWindowGrid">
-                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,5,5" Opacity="{TemplateBinding WindowOpacity}" />
-                     <Grid Margin="0" Background="{x:Null}">
-                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,4,4" Opacity="{TemplateBinding WindowOpacity}" />
-                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,4,4" Margin="1" Opacity="0.7" />
-                     </Grid>
-                  </Grid>
-
-                  <Grid>
-                     <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" MinHeight="26" />
-                        <RowDefinition />
-                     </Grid.RowDefinitions>
-
-                     <!-- Content Border -->
-                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                        <Grid.RowDefinitions>
-                           <RowDefinition />
-                           <RowDefinition Height="Auto" />
-                        </Grid.RowDefinitions>
-                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
-                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-
-                           <Grid MinWidth="350">
-                              <Grid.RowDefinitions>
-                                 <RowDefinition />
-                                 <RowDefinition Height="Auto" />
-                              </Grid.RowDefinitions>
-
-                              <Grid Margin="24,16,24,22">
-                                 <Grid.ColumnDefinitions>
+                        </VisualStateGroup>
+                </VisualStateManager.VisualStateGroups>
+
+                <prim:WindowControl x:Name="PART_WindowControl"
+                                    Caption="{TemplateBinding Caption}" 
+                                    CaptionForeground="{TemplateBinding CaptionForeground}"
+                                    CaptionShadowBrush="{TemplateBinding CaptionShadowBrush}"
+                                    CaptionIcon="{TemplateBinding CaptionIcon}"
+                                    Background="{TemplateBinding Background}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    IsActive="{TemplateBinding IsActive}"
+                                    WindowBackground="{TemplateBinding WindowBackground}"
+                                    WindowInactiveBackground="{TemplateBinding WindowInactiveBackground}" 
+                                    WindowBorderBrush="{TemplateBinding WindowBorderBrush}"
+                                    WindowBorderThickness="{TemplateBinding WindowBorderThickness}"
+                                    CloseButtonStyle="{TemplateBinding CloseButtonStyle}"
+                                    WindowOpacity="{TemplateBinding WindowOpacity}">
+                    <prim:WindowControl.Content>
+                        <Grid MinWidth="350">
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <Grid Margin="24,16,24,22">
+                                <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="Auto" />
                                     <ColumnDefinition Width="*" />
-                                 </Grid.ColumnDefinitions>
-
-                                 <!-- Message Image -->
-                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
-
-                                 <!-- Message Text -->
-                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-                                    <TextBlock x:Name="MessageText"
+                                </Grid.ColumnDefinitions>
+
+                                <!-- Message Image -->
+                                <Image x:Name="MessageBoxImage" 
+                                       VerticalAlignment="Top" 
+                                       SnapsToDevicePixels="True" 
+                                       Stretch="None"
+                                       Source="{TemplateBinding ImageSource}" />
+
+                                <!-- Message Text -->
+                                <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText" 
                                                TextWrapping="Wrap"
-                                               VerticalAlignment="Center"
-                                               MaxWidth="450"
+                                               VerticalAlignment="Center" 
+                                               MaxWidth="450" 
                                                Text="{TemplateBinding Text}" 
-                                               FontFamily="{TemplateBinding FontFamily}"
-                                               FontSize="{TemplateBinding FontSize}"
-                                               FontStyle="{TemplateBinding FontStyle}"
-                                               FontWeight="{TemplateBinding FontWeight}"
-                                               Foreground="{TemplateBinding Foreground}" />
-                                 </ScrollViewer>
-
-                              </Grid>
-
-                              <!-- Buttons -->
-                              <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}" >
+                                               FontFamily="{TemplateBinding FontFamily}" 
+                                               FontSize="{TemplateBinding FontSize}" 
+                                               FontStyle="{TemplateBinding FontStyle}" 
+                                               FontWeight="{TemplateBinding FontWeight}" 
+                                               Foreground="{TemplateBinding Foreground}"
+                                               Margin="10,0,0,0"/>
+                                </ScrollViewer>
+                            </Grid>
+
+                            <!-- Buttons -->
+                            <Border Grid.Row="1" Background="{TemplateBinding ButtonRegionBackground}">
                                 <Grid HorizontalAlignment="Right" Margin="12">
                                     <Grid.ColumnDefinitions>
                                         <ColumnDefinition Width="Auto" />
@@ -284,53 +175,20 @@
                                         <ColumnDefinition Width="Auto" />
                                         <ColumnDefinition Width="Auto" />
                                     </Grid.ColumnDefinitions>
-                                    <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}"/>
-                                    <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}"/>
-                                    <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}"/>
+
+                                    <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" Style="{TemplateBinding YesButtonStyle}" />
+                                    <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" Style="{TemplateBinding NoButtonStyle}" />
+                                    <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" Style="{TemplateBinding OkButtonStyle}" />
                                     <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" Style="{TemplateBinding CancelButtonStyle}" IsCancel="True" />
                                 </Grid>
-                              </Border>
-                           </Grid>
-                        </Border>
-                     </Grid>
-
-                     <!-- Header -->
-                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                        <Grid>
-                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                              <!-- Caption -->
-                              <ContentControl x:Name="Caption"
-                                              Margin="5,0,0,0"
-                                              IsTabStop="False"
-                                              HorizontalAlignment="Stretch"
-                                              Content="{TemplateBinding Caption}"
-                                              Foreground="{TemplateBinding CaptionForeground}" />
-                           </Grid>
-                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
-                        </Grid>
-                     </Border>
-
-                  </Grid>
-
-                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
-
-                  <!-- Close Button -->
-                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
-                        <Path Height="10"
-                              HorizontalAlignment="Center"
-                              VerticalAlignment="Center"
-                              Width="12"
-                              Fill="#E4FFFFFF"
-                              Stretch="Fill"
-                              Stroke="#FF535666" 
-                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
-                     </Button>
-                  </Border>
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
+                            </Border>
+                         </Grid>
+                    </prim:WindowControl.Content>
+                </prim:WindowControl>
+              </Grid>
+           </ControlTemplate>
+        </Setter.Value>
       </Setter>
-   </Style>
+    </Style>
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 085bfec82..2b0ec3dac 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -36,6 +36,7 @@ public class MultiLineTextEditor : ContentControl
 
     #region Properties
 
+    #region DropDownHeight
     public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
     public double DropDownHeight
     {
@@ -48,7 +49,9 @@ public double DropDownHeight
         SetValue( DropDownHeightProperty, value );
       }
     }
+    #endregion DropDownHeight
 
+    #region DropDownWidth
     public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
     public double DropDownWidth
     {
@@ -61,6 +64,7 @@ public double DropDownWidth
         SetValue( DropDownWidthProperty, value );
       }
     }
+    #endregion DropDownWidth
 
     #region IsOpen
 
@@ -91,6 +95,7 @@ protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
 
     #endregion //IsOpen
 
+    #region IsSpellCheckEnabled
     public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
     public bool IsSpellCheckEnabled
     {
@@ -103,7 +108,22 @@ public bool IsSpellCheckEnabled
         SetValue( IsSpellCheckEnabledProperty, value );
       }
     }
+    #endregion IsSpellCheckEnabled
 
+    #region IsReadOnly
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
+    #endregion IsReadOnly
 
     #region Text
 
@@ -134,6 +154,7 @@ protected virtual void OnTextChanged( string oldValue, string newValue )
 
     #endregion //Text
 
+    #region TextAlignment
     public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
     public TextAlignment TextAlignment
     {
@@ -146,7 +167,9 @@ public TextAlignment TextAlignment
         SetValue( TextAlignmentProperty, value );
       }
     }
+    #endregion TextAlignment
 
+    #region TextWrapping
     public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
     public TextWrapping TextWrapping
     {
@@ -159,7 +182,7 @@ public TextWrapping TextWrapping
         SetValue( TextWrappingProperty, value );
       }
     }
-
+    #endregion TextWrapping
 
     #endregion //Properties
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..ff34c8e70
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,161 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="./../Images/Notes16.png" />
+
+    <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+
+                        <Grid>
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="*" />
+                                <ColumnDefinition Width="Auto" />
+                            </Grid.ColumnDefinitions>
+
+                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                                <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                            </Border>
+
+                            <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow"  Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </chrome:ButtonChrome>
+                        </Grid>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- MultiLineTextEditor                                                             -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:MultiLineTextEditor}">
+        <Setter Property="Background" Value="White"/>
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1,1,0,1" />
+        <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="Padding" Value="2,0,0,0" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+                    <Grid x:Name="Root">
+                        <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                            <Border BorderThickness="1" Background="White" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <Grid>
+                                    <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    IsReadOnly="{TemplateBinding IsReadOnly}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                                    <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                                        <Thumb.Template>
+                                            <ControlTemplate TargetType="{x:Type Thumb}">
+                                                <Grid Background="Transparent">
+                                                    <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                                </Grid>
+                                            </ControlTemplate>
+                                        </Thumb.Template>
+                                    </Thumb>
+                                </Grid>
+                            </Border>
+                        </Popup>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+            </Trigger>
+            <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 42d8da4e0..97b07451a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -22,7 +22,7 @@
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Images/Notes16.png" />
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="./../Images/Notes16.png" />
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
       <GradientStop Color="#FFA3AEB9" Offset="0" />
@@ -142,6 +142,7 @@
                                     VerticalScrollBarVisibility="Auto"
                                     HorizontalScrollBarVisibility="Auto"
                                     SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    IsReadOnly="{TemplateBinding IsReadOnly}"
                                     Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
                                     TextAlignment="{TemplateBinding TextAlignment}"
                                     Margin="3" />
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
index 42612bb97..5eb4628f5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
index c8d814759..ac5edab59 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
index dbfe82017..00ffdc3fc 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
@@ -1,23 +1,24 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Globalization;
 using System.IO;
+using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -70,6 +71,21 @@ protected CommonNumericUpDown( FromText fromText, FromDecimal fromDecimal, Func<
     protected static void UpdateMetadata( Type type, T? increment, T? minValue, T? maxValue )
     {
       DefaultStyleKeyProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( type ) );
+      UpdateMetadataCommon( type, increment, minValue, maxValue );
+    }
+
+    internal static void UpdateMetadataInternal( Type type, T? increment, T? minValue, T? maxValue )
+    {
+      // DefaultStyleKey for internal type (eg. UShortUpDown) must be a ComponentResourceKey instead
+      // of the type itself to allow external theme (ex. Office2007 theme) to redefine the default
+      // style of the control.
+      DefaultStyleKeyProperty.OverrideMetadata( type,
+        new FrameworkPropertyMetadata( new ComponentResourceKey( typeof( InputBase ), type.Name ) ) );
+      UpdateMetadataCommon( type, increment, minValue, maxValue );
+    }
+
+    private static void UpdateMetadataCommon( Type type, T? increment, T? minValue, T? maxValue )
+    {
       IncrementProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( increment ) );
       MaximumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( maxValue ) );
       MinimumProperty.OverrideMetadata( type, new FrameworkPropertyMetadata( minValue ) );
@@ -127,6 +143,11 @@ private bool HandleNullSpin()
       return false;
     }
 
+    internal bool IsValid( T? value )
+    {
+      return !IsLowerThan( value, Minimum ) && !IsGreaterThan( value, Maximum );
+    }
+
     private T? CoerceValueMinMax( T value )
     {
       if( IsLowerThan( value, Minimum ) )
@@ -164,17 +185,22 @@ protected override void OnDecrement()
       if( String.IsNullOrEmpty( text ) )
         return result;
 
-      // Since the convertion from Value to text using a FormartString may not be parsable
+      // Since the conversion from Value to text using a FormartString may not be parsable,
       // we verify that the already existing text is not the exact same value.
       string currentValueText = ConvertValueToText();
       if( object.Equals( currentValueText, text ) )
         return this.Value;
 
-      //don't know why someone would format a T as %, but just in case they do.
+      //Don't know why someone would format a T as %, but just in case they do.
       result = FormatString.Contains( "P" )
         ? _fromDecimal( ParsePercent( text, CultureInfo ) )
         : _fromText( text, this.ParsingNumberStyle, CultureInfo );
 
+      if( this.ClipValueToMinMax )
+      {
+        return this.GetClippedMinMaxValue();
+      }
+
       ValidateDefaultMinMax( result );
 
       return result;
@@ -192,7 +218,7 @@ protected override void SetValidSpinDirection()
     {
       ValidSpinDirections validDirections = ValidSpinDirections.None;
 
-      // Null increment always prevent spin
+      // Null increment always prevents spin.
       if( (this.Increment != null) && !IsReadOnly )
       {
         if( IsLowerThan( Value, Maximum ) || !Value.HasValue )
@@ -206,9 +232,22 @@ protected override void SetValidSpinDirection()
         Spinner.ValidSpinDirection = validDirections;
     }
 
+    private T? GetClippedMinMaxValue()
+    {
+      T? result = FormatString.Contains( "P" )
+                ? _fromDecimal( ParsePercent( this.Text, CultureInfo ) )
+                : _fromText( this.Text, this.ParsingNumberStyle, CultureInfo );
+
+      if( this.IsGreaterThan( result, this.Maximum ) )
+        return this.Maximum;
+      else if( this.IsLowerThan( result, this.Minimum ) )
+        return this.Minimum;
+      return result;
+    }
+
     private void ValidateDefaultMinMax( T? value )
     {
-      // DefaultValue is always accepted
+      // DefaultValue is always accepted.
       if( object.Equals( value, DefaultValue ) )
         return;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
index 73ee76606..0ae7d0ea9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
index d431235fc..14b4be6f9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -60,7 +60,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override double? OnCoerceIncrement( double? baseValue )
     {
       if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment" );
+        throw new ArgumentException( "NaN is invalid for Increment." );
 
       return base.OnCoerceIncrement( baseValue );
     }
@@ -68,7 +68,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override double? OnCoerceMaximum( double? baseValue )
     {
       if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum" );
+        throw new ArgumentException( "NaN is invalid for Maximum." );
 
       return base.OnCoerceMaximum( baseValue );
     }
@@ -76,7 +76,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override double? OnCoerceMinimum( double? baseValue )
     {
       if( baseValue.HasValue && double.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is for Minimum" );
+        throw new ArgumentException( "NaN is for Minimum." );
 
       return base.OnCoerceMinimum( baseValue );
     }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
index 833588cd2..544259f68 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
index d4f962091..3b8400c8f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 517761a97..282ffdef1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
@@ -25,6 +25,23 @@ public abstract class NumericUpDown<T> : UpDownBase<T>
   {
     #region Properties
 
+    #region ClipValueToMinMax
+
+    public static readonly DependencyProperty ClipValueToMinMaxProperty = DependencyProperty.Register( "ClipValueToMinMax", typeof( bool ), typeof( NumericUpDown<T> ), new UIPropertyMetadata(false ) );
+    public bool ClipValueToMinMax
+    {
+      get
+      {
+        return ( bool )GetValue( ClipValueToMinMaxProperty );
+      }
+      set
+      {
+        SetValue( ClipValueToMinMaxProperty, value );
+      }
+    }
+
+    #endregion //ClipValueToMinMax
+
     #region FormatString
 
     public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
index 7f2e638d5..0802d0faa 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class SByteUpDown : CommonNumericUpDown<sbyte>
 
     static SByteUpDown()
     {
-      UpdateMetadata( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
+      UpdateMetadataInternal( typeof( SByteUpDown ), ( sbyte )1, sbyte.MinValue, sbyte.MaxValue );
     }
 
     public SByteUpDown()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
index 4fd33f022..50afebaeb 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
index b2aa4869c..a1a095b79 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -27,7 +27,7 @@ public class SingleUpDown : CommonNumericUpDown<float>
 
     static SingleUpDown()
     {
-      UpdateMetadata( typeof( SingleUpDown ), 1f, float.PositiveInfinity, float.NegativeInfinity );
+      UpdateMetadata( typeof( SingleUpDown ), 1f, float.NegativeInfinity, float.PositiveInfinity );
     }
 
     public SingleUpDown()
@@ -59,7 +59,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override float? OnCoerceIncrement( float? baseValue )
     {
       if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Increment" );
+        throw new ArgumentException( "NaN is invalid for Increment." );
 
       return base.OnCoerceIncrement( baseValue );
     }
@@ -67,7 +67,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override float? OnCoerceMaximum( float? baseValue )
     {
       if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Maximum" );
+        throw new ArgumentException( "NaN is invalid for Maximum." );
 
       return base.OnCoerceMaximum( baseValue );
     }
@@ -75,7 +75,7 @@ public AllowedSpecialValues AllowInputSpecialValues
     protected override float? OnCoerceMinimum( float? baseValue )
     {
       if( baseValue.HasValue && float.IsNaN( baseValue.Value ) )
-        throw new ArgumentException( "NaN is invalid for Minimum" );
+        throw new ArgumentException( "NaN is invalid for Minimum." );
 
       return base.OnCoerceMinimum( baseValue );
     }
@@ -92,7 +92,7 @@ protected override float DecrementValue( float value, float increment )
 
     protected override void SetValidSpinDirection()
     {
-      if( Value.HasValue && float.IsInfinity( Value.Value ) )
+      if( Value.HasValue && float.IsInfinity( Value.Value ) && ( Spinner != null ) )
       {
         Spinner.ValidSpinDirection = ValidSpinDirections.None;
       }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
index 625bdd8a8..3a22829c2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class UIntegerUpDown : CommonNumericUpDown<uint>
 
     static UIntegerUpDown()
     {
-      UpdateMetadata( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
+      UpdateMetadataInternal( typeof( UIntegerUpDown ), ( uint )1, uint.MinValue, uint.MaxValue );
     }
 
     public UIntegerUpDown()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
index f0d8fe4b3..f7c71d1c2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class ULongUpDown : CommonNumericUpDown<ulong>
 
     static ULongUpDown()
     {
-      UpdateMetadata( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
+      UpdateMetadataInternal( typeof( ULongUpDown ), ( ulong )1, ulong.MinValue, ulong.MaxValue );
     }
 
     public ULongUpDown()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
index a9e936641..5d1e5e0fe 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,7 +25,7 @@ internal class UShortUpDown : CommonNumericUpDown<ushort>
 
     static UShortUpDown()
     {
-      UpdateMetadata( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
+      UpdateMetadataInternal( typeof( UShortUpDown ), ( ushort )1, ushort.MinValue, ushort.MaxValue );
     }
 
     public UShortUpDown()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c7c894a1b
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,168 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="NumericUpDown" TargetType="{x:Type prim:InputBase}">
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="HorizontalContentAlignment" Value="Right" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="TextAlignment" Value="Right" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Control">
+                    <local:ButtonSpinner x:Name="PART_Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                        <local:WatermarkTextBox x:Name="PART_TextBox"
+                                          BorderThickness="0"
+                                          Background="{TemplateBinding Background}"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="{TemplateBinding Padding}"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+                    </local:ButtonSpinner>
+
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                            <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- DecimalUpDown                                                                   -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- DoubleUpDown                                                                    -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- IntegerUpDown                                                                   -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- ShortUpDown                                                                     -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:ShortUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- LongUpDown                                                                      -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:LongUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- ByteUpDown                                                                      -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:ByteUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+    <!-- =============================================================================== -->
+    <!-- SingleUpDown                                                                    -->
+    <!-- =============================================================================== -->
+    <Style TargetType="{x:Type local:SingleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- Style for all internal derived types of NumericUpDown must have a               -->
+   <!-- ComponentResourceKey key to allow external theme to redefine the default style  -->
+   <!-- (ex. Office2007 theme)                                                          -->
+   <!-- =============================================================================== -->
+
+   <!-- =============================================================================== -->
+   <!-- SByteUpDown                                                                     -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=SByteUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- UIntegerUpDown                                                                  -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UIntegerUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- ULongUpDown                                                                     -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=ULongUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+   <!-- =============================================================================== -->
+   <!-- UShortUpDown                                                                    -->
+   <!-- =============================================================================== -->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UShortUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
index f86d5f5fb..1c97451b9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -1,47 +1,50 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
                     xmlns:prim="clr-namespace:Xceed.Wpf.Toolkit.Primitives"
                     xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <Style x:Key="NumericUpDown" TargetType="{x:Type prim:InputBase}">
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
       <Setter Property="BorderThickness" Value="1" />
       <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
       <Setter Property="HorizontalContentAlignment" Value="Right" />
       <Setter Property="IsTabStop" Value="False" />
       <Setter Property="VerticalContentAlignment" Value="Center" />
       <Setter Property="TextAlignment" Value="Right" />
-      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />      
-      <Setter Property="Template">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
          <Setter.Value>
             <ControlTemplate TargetType="Control">
                <local:ButtonSpinner x:Name="PART_Spinner"
                                     IsTabStop="False"
                                     Background="{TemplateBinding Background}"
                                     BorderThickness="{TemplateBinding BorderThickness}"
+                                    BorderBrush="{TemplateBinding BorderBrush}"
                                     AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
                                     ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
                         <local:WatermarkTextBox x:Name="PART_TextBox"
@@ -58,7 +61,7 @@
                                           IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
                                           MinWidth="20"
                                           AcceptsReturn="False"
-                                          Padding="0"
+                                          Padding="{TemplateBinding Padding}"
                                           SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
                                           TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
                                           TextWrapping="NoWrap" 
@@ -71,6 +74,9 @@
                   <Trigger Property="IsEnabled" Value="False">
                      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
                   </Trigger>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TextBox" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TextBox}" />
+                   </Trigger>
                </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
@@ -112,25 +118,43 @@
    <!-- =============================================================================== -->
    <Style TargetType="{x:Type local:SingleUpDown}" BasedOn="{StaticResource NumericUpDown}" />
 
+   <!-- =============================================================================== -->
+   <!-- Style for all internal derived types of NumericUpDown must have a               -->
+   <!-- ComponentResourceKey key to allow external theme to redefine the default style  -->
+   <!-- (ex. Office2007 theme)                                                          -->
+   <!-- =============================================================================== -->
+
    <!-- =============================================================================== -->
    <!-- SByteUpDown                                                                     -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:SByteUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=SByteUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- UIntegerUpDown                                                                  -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:UIntegerUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UIntegerUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- ULongUpDown                                                                     -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:ULongUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=ULongUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
    <!-- =============================================================================== -->
    <!-- UShortUpDown                                                                    -->
    <!-- =============================================================================== -->
-   <Style TargetType="{x:Type local:UShortUpDown}" BasedOn="{StaticResource NumericUpDown}" />
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type prim:InputBase}, 
+                  ResourceId=UShortUpDown}" 
+          TargetType="{x:Type prim:InputBase}" BasedOn="{StaticResource NumericUpDown}" />
 
 
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
index a932ec5f1..46e0127c6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index 703929ee2..38dd9addc 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
index b928597f9..538628fea 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
index 435c98523..3d051719d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using Xceed.Wpf.Toolkit.Media.Animation;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
index a30c06a91..a89d5edf9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
index cdfeeeeb0..ab5f4e856 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
index 5800a852b..66d4acac6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
index b37f2fdd6..d0fb56c1c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
index f8ddef7e7..a1dd43b0a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
index f1d8e2fe1..64faa9e48 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
index ce49d65a0..7d7d53b73 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
index 890c74013..e04105227 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
index 08bffe65b..4a6af9b2a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
index 562a0fe6c..1d079e2a6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
index 8835db3c7..3217f008e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
index 87519982e..7a023c235 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
@@ -1,23 +1,22 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
@@ -27,8 +26,10 @@ public class RandomPanel : AnimationPanel
 
     public static readonly DependencyProperty MinimumWidthProperty =
       DependencyProperty.Register( "MinimumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 10d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          10d,
+          new PropertyChangedCallback( RandomPanel.OnMinimumWidthChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMinimumWidth ) ) );
 
     public double MinimumWidth
     {
@@ -42,14 +43,39 @@ public double MinimumWidth
       }
     }
 
+    private static void OnMinimumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MaximumWidthProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMinimumWidth( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double maximum = panel.MaximumWidth;
+      if( value > maximum )
+        return maximum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MinimumHeight Property
 
     public static readonly DependencyProperty MinimumHeightProperty =
       DependencyProperty.Register( "MinimumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 10d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          10d,
+          new PropertyChangedCallback( RandomPanel.OnMinimumHeightChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMinimumHeight ) ) );
 
     public double MinimumHeight
     {
@@ -63,14 +89,39 @@ public double MinimumHeight
       }
     }
 
+    private static void OnMinimumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MaximumHeightProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMinimumHeight( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double maximum = panel.MaximumHeight;
+      if( value > maximum )
+        return maximum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MaximumWidth Property
 
     public static readonly DependencyProperty MaximumWidthProperty =
       DependencyProperty.Register( "MaximumWidth", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 100d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          100d,
+          new PropertyChangedCallback( RandomPanel.OnMaximumWidthChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMaximumWidth ) ) );
 
     public double MaximumWidth
     {
@@ -84,14 +135,39 @@ public double MaximumWidth
       }
     }
 
+    private static void OnMaximumWidthChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MinimumWidthProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMaximumWidth( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double minimum = panel.MinimumWidth;
+      if( value < minimum )
+        return minimum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region MaximumHeight Property
 
     public static readonly DependencyProperty MaximumHeightProperty =
       DependencyProperty.Register( "MaximumHeight", typeof( double ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 100d,
-          new PropertyChangedCallback( RandomPanel.OnInvalidateMeasure ) ) );
+        new FrameworkPropertyMetadata(
+          100d,
+          new PropertyChangedCallback( RandomPanel.OnMaximumHeightChanged ),
+          new CoerceValueCallback( RandomPanel.CoerceMaximumHeight ) ) );
 
     public double MaximumHeight
     {
@@ -105,13 +181,36 @@ public double MaximumHeight
       }
     }
 
+    private static void OnMaximumHeightChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+
+      panel.CoerceValue( RandomPanel.MinimumHeightProperty );
+      panel.InvalidateMeasure();
+    }
+
+    private static object CoerceMaximumHeight( DependencyObject d, object baseValue )
+    {
+      RandomPanel panel = ( RandomPanel )d;
+      double value = ( double )baseValue;
+
+      if( double.IsNaN( value ) || double.IsInfinity( value ) || ( value < 0d ) )
+        return DependencyProperty.UnsetValue;
+
+      double minimum = panel.MinimumHeight;
+      if( value < minimum )
+        return minimum;
+
+      return baseValue;
+    }
+
     #endregion
 
     #region Seed Property
 
     public static readonly DependencyProperty SeedProperty =
       DependencyProperty.Register( "Seed", typeof( int ), typeof( RandomPanel ),
-        new FrameworkPropertyMetadata( 0, 
+        new FrameworkPropertyMetadata( 0,
           new PropertyChangedCallback( RandomPanel.SeedChanged ) ) );
 
     public int Seed
@@ -142,7 +241,7 @@ private static void SeedChanged( DependencyObject obj, DependencyPropertyChanged
 
     // Using a DependencyProperty as the backing store for ActualSize.  This enables animation, styling, binding, etc...
     private static readonly DependencyProperty ActualSizeProperty =
-      DependencyProperty.RegisterAttached( "ActualSize", typeof( Size ), typeof( RandomPanel ), 
+      DependencyProperty.RegisterAttached( "ActualSize", typeof( Size ), typeof( RandomPanel ),
         new UIPropertyMetadata( new Size() ) );
 
     private static Size GetActualSize( DependencyObject obj )
@@ -167,7 +266,8 @@ protected override Size MeasureChildrenOverride( UIElementCollection children, S
           continue;
 
         Size childSize = new Size( 1d * _random.Next( Convert.ToInt32( MinimumWidth ), Convert.ToInt32( MaximumWidth ) ),
-                                    1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
+                                   1d * _random.Next( Convert.ToInt32( MinimumHeight ), Convert.ToInt32( MaximumHeight ) ) );
+
         child.Measure( childSize );
         RandomPanel.SetActualSize( child, childSize );
       }
@@ -194,17 +294,6 @@ protected override Size ArrangeChildrenOverride( UIElementCollection children, S
       return finalSize;
     }
 
-    private static void OnInvalidateMeasure( DependencyObject d, DependencyPropertyChangedEventArgs e )
-    {
-      RandomPanel panel = d as RandomPanel;
-      if( panel.MinimumWidth > panel.MaximumWidth )
-        throw new InvalidDataException( "MinWidth can't be greater than MaxWidth" );
-      else if( panel.MinimumHeight > panel.MaximumHeight )
-        throw new InvalidDataException( "MinHeight can't be greater than MaxHeight" );
-      else
-        ( ( AnimationPanel )d ).InvalidateMeasure();
-    }
-
     #region Private Fields
 
     private Random _random = new Random();
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
index 60893c21a..523041aa3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
index 60f81d0eb..c5a05da15 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
index 3c192f92c..b4585aa75 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
index 9b2e394fe..01c66fe26 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Threading;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
index 232204894..d99909abd 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.ObjectModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
index ba2fa6e7b..febf9c185 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Specialized;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
index feadce5b3..583e4ab55 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index c417e0371..6e5a09534 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 #region Using directives
 
@@ -36,7 +36,7 @@ This program is provided to you under the terms of the Microsoft Public
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
 [assembly: AssemblyProduct( "Xceed Extended WPF Toolkit" )]
-[assembly: AssemblyCopyright( "Copyright © Xceed Software Inc. 2010-2012" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2013" )]
 [assembly: AssemblyCulture( "" )]
 
 
@@ -72,6 +72,7 @@ This program is provided to you under the terms of the Microsoft Public
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Converters" )]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Input" )]
+[assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Media")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Core.Utilities")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Chromes")]
 [assembly: XmlnsDefinition("http://schemas.xceed.com/wpf/xaml/toolkit", "Xceed.Wpf.Toolkit.Primitives")]
@@ -86,7 +87,7 @@ This program is provided to you under the terms of the Microsoft Public
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"sn.snk" )]
+[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
index 1f7a7c6d9..71907a5c4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
index ffbd0ece7..512685fca 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
index 3390129e9..420ce78e1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
new file mode 100644
index 000000000..0c1179d95
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
@@ -0,0 +1,45 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
+{
+  /// <summary>
+  /// This attribute can decorate the collection properties (i.e., IList) 
+  /// of your selected object in order to control the types that will be allowed
+  /// to be instantiated in the CollectionControl.
+  /// </summary>
+  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
+  public class NewItemTypesAttribute : Attribute
+  {
+    public IList<Type> Types
+    {
+      get;
+      set;
+    }
+
+    public NewItemTypesAttribute( params Type[] types )
+    {
+      this.Types = new List<Type>( types );
+    }
+
+    public NewItemTypesAttribute()
+    {
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
index 87f2511e4..4e34c4637 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
index 47298a296..b7ecb93af 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
index 384b9b8cd..c6ef65982 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
new file mode 100644
index 000000000..7e656da3c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
@@ -0,0 +1,58 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Globalization;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class CommonPropertyExceptionValidationRule : ValidationRule
+  {
+    private TypeConverter _propertyTypeConverter;
+    private Type _type;
+
+    internal CommonPropertyExceptionValidationRule( Type type )
+    {
+      _propertyTypeConverter = TypeDescriptor.GetConverter( type );
+      _type = type;
+    }
+
+    public override ValidationResult Validate( object value, CultureInfo cultureInfo )
+    {
+      ValidationResult result = new ValidationResult( true, null );
+
+      if( GeneralUtilities.CanConvertValue( value, _type ) )
+      {
+        try
+        {
+          _propertyTypeConverter.ConvertFrom( value );
+        }
+        catch( Exception e )
+        {
+          // Will display a red border in propertyGrid
+          result = new ValidationResult( false, e.Message );
+        }
+      }
+      return result;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
new file mode 100644
index 000000000..83e6f6982
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
@@ -0,0 +1,196 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System.Collections.Generic;
+using System.Collections;
+using System;
+using System.Windows;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Windows.Data;
+using System.Diagnostics;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal abstract class ContainerHelperBase
+  {
+    protected readonly IPropertyContainer PropertyContainer;
+
+    public ContainerHelperBase(IPropertyContainer propertyContainer)
+    {
+      if( propertyContainer == null )
+        throw new ArgumentNullException( "propertyContainer" );
+
+      PropertyContainer = propertyContainer;
+
+      var propChange = propertyContainer as INotifyPropertyChanged;
+      if( propChange != null )
+      {
+        propChange.PropertyChanged += new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
+      }
+    }
+
+    #region IsGenerated attached property
+
+    internal static readonly DependencyProperty IsGeneratedProperty = DependencyProperty.RegisterAttached(
+      "IsGenerated",
+      typeof( bool ),
+      typeof( ContainerHelperBase ),
+      new PropertyMetadata( false ) );
+
+    internal static bool GetIsGenerated( DependencyObject obj )
+    {
+      return ( bool )obj.GetValue( ContainerHelperBase.IsGeneratedProperty );
+    }
+
+    internal static void SetIsGenerated( DependencyObject obj, bool value )
+    {
+      obj.SetValue( ContainerHelperBase.IsGeneratedProperty, value );
+    }
+
+    #endregion IsGenerated attached property
+
+    public abstract IList Properties
+    {
+      get;
+    }
+
+    internal ItemsControl ChildrenItemsControl
+    {
+      get;
+      set;
+    }
+
+    public virtual void ClearHelper()
+    {
+      var propChange = PropertyContainer as INotifyPropertyChanged;
+      if( propChange != null )
+      {
+        propChange.PropertyChanged -= new PropertyChangedEventHandler( OnPropertyContainerPropertyChanged );
+      }
+
+      // Calling RemoveAll() will force the ItemsContol displaying the
+      // properties to clear all the current container (i.e., ClearContainerForItem).
+      // This will make the call at "ClearChildrenPropertyItem" for every prepared
+      // container. Fortunately, the ItemsContainer will not re-prepare the items yet
+      // (i.e., probably made on next measure pass), allowing us to set up the new
+      // parent helper.
+      if( ChildrenItemsControl != null )
+      {
+        ( ( IItemContainerGenerator )ChildrenItemsControl.ItemContainerGenerator ).RemoveAll();
+      }
+    }
+
+    public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) 
+    {
+      // Initialize the parent node
+      propertyItem.ParentNode = PropertyContainer;
+
+      PropertyGrid.RaisePreparePropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
+    }
+
+    public virtual void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+
+      propertyItem.ParentNode = null;
+
+      PropertyGrid.RaiseClearPropertyItemEvent( ( UIElement )PropertyContainer, propertyItem, item );
+    }
+
+    protected FrameworkElement GenerateCustomEditingElement( Type definitionKey, PropertyItemBase propertyItem )
+    {
+      FrameworkElement editor = null;
+
+      if( PropertyContainer.EditorDefinitions != null )
+      {
+        // If no editor for the current type, fall back on base type editor recursively.
+        while( editor == null && definitionKey != null )
+        {
+          editor = this.CreateCustomEditor( PropertyContainer.EditorDefinitions[ definitionKey ], propertyItem );
+          definitionKey = definitionKey.BaseType;
+        }
+      }
+
+      return editor;
+    }
+
+    protected FrameworkElement GenerateCustomEditingElement( object definitionKey, PropertyItemBase propertyItem )
+    {
+      return ( PropertyContainer.EditorDefinitions != null )
+        ? this.CreateCustomEditor( PropertyContainer.EditorDefinitions[ definitionKey ], propertyItem )
+        : null;
+    }
+
+    protected FrameworkElement CreateCustomEditor( EditorDefinitionBase customEditor, PropertyItemBase propertyItem )
+    {
+      return ( customEditor != null )
+        ? customEditor.GenerateEditingElementInternal( propertyItem )
+        : null;
+    }
+
+    protected virtual void OnPropertyContainerPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      var propertyName = e.PropertyName;
+      IPropertyContainer ps = null;
+      if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.FilterInfo ) )
+      {
+        this.OnFilterChanged();
+      }
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.IsCategorized ) )
+      {
+        this.OnCategorizationChanged();
+      }
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.AutoGenerateProperties ) )
+      {
+        this.OnAutoGeneratePropertiesChanged();
+      }
+      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ))
+      {
+        this.OnEditorDefinitionsChanged();
+      }
+      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ))
+      {
+        this.OnPropertyDefinitionsChanged();
+      }
+    }
+
+    protected virtual void OnCategorizationChanged() { }
+
+    protected virtual void OnFilterChanged() { }
+
+    protected virtual void OnAutoGeneratePropertiesChanged() { }
+
+    protected virtual void OnEditorDefinitionsChanged() { }
+
+    protected virtual void OnPropertyDefinitionsChanged() { }
+
+    public virtual void OnEndInit() { }
+
+    public abstract PropertyItemBase ContainerFromItem( object item );
+
+    public abstract object ItemFromContainer( PropertyItemBase container );
+
+    public abstract Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem );
+
+    public virtual void NotifyEditorDefinitionsCollectionChanged() { }
+    public virtual void NotifyPropertyDefinitionsCollectionChanged() { }
+
+    public abstract void UpdateValuesFromSource();
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
new file mode 100644
index 000000000..669e01d11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
@@ -0,0 +1,52 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Globalization;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  /// <summary>
+  /// Converts a TimeSpan value to a DateTime value.
+  /// 
+  /// This converter can be used in conjunction with a TimePicker in order 
+  /// to create a TimeSpan edit control. 
+  /// </summary>
+  public sealed class EditorTimeSpanConverter : IValueConverter
+  {
+    public bool AllowNulls { get; set; }
+
+    object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( this.AllowNulls && value == null )
+        return null;
+
+      TimeSpan timeSpan = ( value != null ) ? ( TimeSpan )value : TimeSpan.Zero;
+      return DateTime.Today + timeSpan;
+    }
+
+    object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      if( this.AllowNulls && value == null )
+        return null;
+
+      return ( value != null )
+        ? ( ( DateTime )value ).TimeOfDay
+        : TimeSpan.Zero;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
index d625a2826..c2e686146 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
new file mode 100644
index 000000000..ad71a2db1
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
@@ -0,0 +1,105 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.ComponentModel;
+using System.Collections;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
+{
+  internal class ListConverter : TypeConverter
+  {
+    public override bool CanConvertFrom( ITypeDescriptorContext context, Type sourceType )
+    {
+      return true;
+    }
+
+    public override bool CanConvertTo( ITypeDescriptorContext context, Type destinationType )
+    {
+      return ( destinationType == typeof( string ) );
+    }
+
+    public override object ConvertFrom( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value )
+    {
+      if( value == null )
+        return null;
+
+      string names = value as string;
+
+      var list = new List<object>();
+      if( names == null && value != null )
+      {
+        list.Add( value );
+      }
+      else
+      {
+        if( names == null )
+          return null;
+
+        foreach( var name in names.Split( ',' ) )
+        {
+          list.Add( name.Trim() );
+        }
+      }
+
+      return new ReadOnlyCollection<object>( list );
+    }
+
+    public override object ConvertTo( ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType )
+    {
+      if( destinationType != typeof( string ) )
+        throw new InvalidOperationException( "Can only convert to string." );
+
+
+      IList strs = ( IList )value;
+
+      if( strs == null )
+        return null;
+
+      StringBuilder sb = new StringBuilder();
+      bool first = true;
+      foreach( object o in strs )
+      {
+        if( o == null )
+          throw new InvalidOperationException( "Property names cannot be null." );
+
+        string s = o as string;
+        if( s == null )
+          throw new InvalidOperationException( "Does not support serialization of non-string property names." );
+
+        if( s.Contains( ',' ) )
+          throw new InvalidOperationException( "Property names cannot contain commas." );
+
+        if( s.Trim().Length != s.Length )
+          throw new InvalidOperationException( "Property names cannot start or end with whitespace characters." );
+
+        if( !first )
+        {
+          sb.Append( ", " );
+        }
+        first = false;
+
+        sb.Append( s );
+      }
+
+      return sb.ToString();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
index ac6aa9f6e..972558d4f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
new file mode 100644
index 000000000..eb02a6c11
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
@@ -0,0 +1,99 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// Used when properties are provided using a list source of items (eg. Properties or PropertiesSource). 
+  /// 
+  /// An instance of this class can be used as an item to easily customize the 
+  /// display of the property directly by modifying the values of this class 
+  /// (e.g., DisplayName, value, Category, etc.).
+  /// </summary>
+  public class CustomPropertyItem : PropertyItemBase
+  {
+
+    internal CustomPropertyItem() { }
+
+    #region Category
+
+    public static readonly DependencyProperty CategoryProperty =
+        DependencyProperty.Register( "Category", typeof( string ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null ) );
+
+    public string Category
+    {
+      get { return ( string )GetValue( CategoryProperty ); }
+      set { SetValue( CategoryProperty, value ); }
+    }
+
+    #endregion //Category
+
+    #region Value
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( CustomPropertyItem ), new UIPropertyMetadata( null, OnValueChanged, OnCoerceValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private static object OnCoerceValueChanged( DependencyObject o, object baseValue )
+    {
+      CustomPropertyItem prop = o as CustomPropertyItem;
+      if( prop != null )
+        return prop.OnCoerceValueChanged( baseValue );
+
+      return baseValue;
+    }
+
+    protected virtual object OnCoerceValueChanged( object baseValue )
+    {
+      return baseValue;
+    }
+
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CustomPropertyItem propertyItem = o as CustomPropertyItem;
+      if( propertyItem != null )
+      {
+        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+      }
+    }
+
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( IsInitialized )
+      {
+        RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+      }
+    }
+
+    #endregion //Value
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
new file mode 100644
index 000000000..6d28674a9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
@@ -0,0 +1,58 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using System.Windows.Data;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public abstract class EditorDefinitionBase : PropertyDefinitionBase
+  {
+
+    internal EditorDefinitionBase() { }
+
+    internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) 
+    {
+      return this.GenerateEditingElement( propertyItem );
+    }
+
+    protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) { return null; }
+
+    internal void UpdateProperty( FrameworkElement element, DependencyProperty elementProp, DependencyProperty definitionProperty )
+    {
+      object currentValue = this.GetValue( definitionProperty );
+      object localValue = this.ReadLocalValue( definitionProperty );
+      // Avoid setting values if it does not affect anything 
+      // because setting a local value may prevent a style setter from being active.
+      if( ( localValue != DependencyProperty.UnsetValue )
+        || currentValue != element.GetValue( elementProp ) )
+      {
+        element.SetValue( elementProp, currentValue );
+      }
+      else
+      {
+        element.ClearValue( elementProp );
+      }
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
new file mode 100644
index 000000000..3449f5bfb
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
@@ -0,0 +1,47 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class EditorTemplateDefinition : EditorDefinitionBase
+  {
+
+
+    #region EditingTemplate
+    public static readonly DependencyProperty EditingTemplateProperty =
+        DependencyProperty.Register( "EditingTemplate", typeof( DataTemplate ), typeof( EditorTemplateDefinition ), new UIPropertyMetadata( null ) );
+
+    public DataTemplate EditingTemplate
+    {
+      get { return ( DataTemplate )GetValue( EditingTemplateProperty ); }
+      set { SetValue( EditingTemplateProperty, value ); }
+    }
+    #endregion //EditingTemplate
+
+    protected override sealed FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem )
+    {
+      return ( this.EditingTemplate != null )
+        ? this.EditingTemplate.LoadContent() as FrameworkElement
+        : null;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
new file mode 100644
index 000000000..b09a190f6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
@@ -0,0 +1,85 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public abstract class PropertyDefinitionBase : DependencyObject
+  {
+    private IList _targetProperties;
+    private bool _isLocked;
+
+    internal PropertyDefinitionBase()
+    {
+      _targetProperties = new List<object>();
+    }
+
+    [TypeConverter(typeof(ListConverter))]
+    public IList TargetProperties 
+    {
+      get { return _targetProperties; }
+      set 
+      {
+        if( this.IsLocked )
+          throw new InvalidOperationException( @"Cannot modify TargetProperties once the definition has beed added to a collection." );
+
+        _targetProperties = value; 
+      }
+    }
+
+    internal bool IsLocked
+    {
+      get{ return _isLocked; }
+    }
+
+    internal virtual void Lock()
+    {
+      if( this.IsLocked )
+        return;
+
+      // Just create a new copy of the properties target to ensure 
+      // that the list doesn't ever get modified.
+
+      List<object> newList = new List<object>();
+      if( _targetProperties != null )
+      {
+        foreach( object p in _targetProperties )
+        {
+          object prop = p;
+          // Convert all TargetPropertyType to Types
+          var targetType = prop as TargetPropertyType;
+          if( targetType != null )
+          {
+            prop = targetType.Type;
+          }
+          newList.Add( prop );
+        }
+      }
+
+      _targetProperties = new ReadOnlyCollection<object>( newList );
+      _isLocked = true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index a40d6980a..b64c2daec 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -28,7 +28,7 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.PropertyGrid.Commands;
 using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
+using System.Reflection;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -36,6 +36,7 @@ internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
   {
     #region Members
 
+    private readonly object _selectedObject;
     private readonly PropertyDescriptor _propertyDescriptor;
     private readonly DependencyPropertyDescriptor _dpDescriptor;
     private readonly MarkupObject _markupObject;
@@ -44,22 +45,25 @@ internal class DescriptorPropertyDefinition : DescriptorPropertyDefinitionBase
 
     #region Constructor
 
-    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, IPropertyParent propertyParent )
-      : base( propertyParent )
+    internal DescriptorPropertyDefinition( PropertyDescriptor propertyDescriptor, object selectedObject )
     {
       if( propertyDescriptor == null )
         throw new ArgumentNullException( "propertyDescriptor" );
 
+      if( selectedObject == null )
+        throw new ArgumentNullException( "selectedObject" );
+
       _propertyDescriptor = propertyDescriptor;
+      _selectedObject = selectedObject;
       _dpDescriptor = DependencyPropertyDescriptor.FromProperty( propertyDescriptor );
-      _markupObject = MarkupWriter.GetMarkupObjectFor( _propertyParent.ValueInstance );
+      _markupObject = MarkupWriter.GetMarkupObjectFor( SelectedObject );
     }
 
     #endregion
 
     #region Custom Properties
 
-    public PropertyDescriptor PropertyDescriptor
+    internal override PropertyDescriptor PropertyDescriptor
     {
       get
       {
@@ -67,58 +71,45 @@ public PropertyDescriptor PropertyDescriptor
       }
     }
 
+    private object SelectedObject
+    {
+      get
+      {
+        return _selectedObject;
+      }
+    }
+
     #endregion
 
     #region Override Methods
 
-    protected override void SetBinding()
+    protected override BindingBase CreateValueBinding()
     {
-      //Bind The value property with the source object.
+      //Bind the value property with the source object.
       var binding = new Binding( PropertyDescriptor.Name )
       {
-        Source = _propertyParent.ValueInstance,
+        Source = SelectedObject,
         Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
         ValidatesOnDataErrors = true,
         ValidatesOnExceptions = true
       };
 
-      BindingOperations.SetBinding( this, DescriptorPropertyDefinition.ValueProperty, binding );
-    }
-
-
-    protected override string GetPropertyName()
-    {
-      return PropertyDescriptor.Name;
-    }
-
-    protected override Type GetPropertyType()
-    {
-      return PropertyDescriptor.PropertyType;
-    }
-
-    protected override string GetPropertyDisplayName()
-    {
-      return PropertyDescriptor.DisplayName;
+      return binding;
     }
 
-    protected override bool IsPropertyDescriptorReadOnly()
+    protected override bool ComputeIsReadOnly()
     {
       return PropertyDescriptor.IsReadOnly;
     }
 
-    internal override PropertyDescriptor GetPropertyDescriptor()
-    {
-      return PropertyDescriptor;
-    }
-
-    protected override ITypeEditor CreateDefaultEditor()
+    internal override ITypeEditor CreateDefaultEditor()
     {
       return PropertyGridUtilities.CreateDefaultEditor( PropertyDescriptor.PropertyType, PropertyDescriptor.Converter );
     }
 
     protected override bool ComputeCanResetValue()
     {
-      return PropertyDescriptor.CanResetValue( _propertyParent.ValueInstance )
+      return PropertyDescriptor.CanResetValue( SelectedObject )
         && !PropertyDescriptor.IsReadOnly;
     }
 
@@ -126,7 +117,7 @@ protected override AdvancedOptionsValues ComputeAdvancedOptionsValues()
     {
       string imageName;
       object tooltip;
-      UpdateAdvanceOptionsForItem( _markupObject, _propertyParent.ValueInstance as DependencyObject, _dpDescriptor, out imageName, out tooltip );
+      UpdateAdvanceOptionsForItem( _markupObject, SelectedObject as DependencyObject, _dpDescriptor, out imageName, out tooltip );
 
       return CreateAdvanceOptionValues( imageName, tooltip );
     }
@@ -153,61 +144,41 @@ protected override bool ComputeIsExpandable()
       return isExpandable;
     }
 
+    protected override IList<Type> ComputeNewItemTypes()
+    {
+      return ( IList<Type> )ComputeNewItemTypesForItem( PropertyDescriptor );
+    }
     protected override string ComputeDescription()
     {
-      return ( string )ComputeDescriptionForItem( GetPropertyDescriptor() );
+      return ( string )ComputeDescriptionForItem( PropertyDescriptor );
     }
 
     protected override int ComputeDisplayOrder()
     {
-      return ( int )ComputeDisplayOrderForItem( GetPropertyDescriptor() );
-    }
-
-    protected override IEnumerable<IPropertyDefinition> GenerateChildrenProperties()
-    {
-      object value = this.ValueInstance;
-
-      if( value == null )
-        return new IPropertyDefinition[ 0 ];
-
-      var propertyDefs = new List<IPropertyDefinition>();
-
-      try
-      {
-        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( value );
-
-        foreach( PropertyDescriptor descriptor in descriptors )
-        {
-          if( descriptor.IsBrowsable )
-          {
-            DescriptorPropertyDefinition def = new DescriptorPropertyDefinition( descriptor, this );
-            def.InitProperties();
-            propertyDefs.Add( def );
-          }
-        }
-      }
-      catch( Exception )
-      {
-        //TODO: handle this some how
-      }
-
-      return propertyDefs;
+      return ( int )ComputeDisplayOrderForItem( PropertyDescriptor );
     }
 
     protected override void ResetValue()
     {
-      PropertyDescriptor.ResetValue( _propertyParent.ValueInstance );
+      PropertyDescriptor.ResetValue( SelectedObject );
     }
 
-    protected override ITypeEditor GetAttributeEditor()
+    internal override ITypeEditor CreateAttributeEditor()
     {
       var editorAttribute = GetAttribute<EditorAttribute>();
       if( editorAttribute != null )
       {
         Type type = Type.GetType( editorAttribute.EditorTypeName );
-        var instance = Activator.CreateInstance( type );
-        if( instance is ITypeEditor )
-          return ( ITypeEditor )instance;
+
+        // If the editor does not have any public parameterless constructor, forget it.
+        if( typeof( ITypeEditor ).IsAssignableFrom( type )
+          && ( type.GetConstructor( new Type[ 0 ] ) != null ) )
+        {
+          var instance = Activator.CreateInstance( type ) as ITypeEditor;
+          Debug.Assert( instance != null, "Type was expected to be ITypeEditor with public constructor." );
+          if( instance != null )
+            return instance;
+        }
       }
 
       var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>();
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
index bc731b0d5..3ef65525d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -31,36 +31,29 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media.Imaging;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
-namespace Xceed.Wpf.Toolkit.PropertyGrid.Implementation
+namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  internal class DescriptorPropertyDefinitionBase : DependencyObject, IPropertyDefinition, IPropertyParent
+  internal abstract class DescriptorPropertyDefinitionBase : DependencyObject
   {
     #region Members
 
-    internal readonly IPropertyParent _propertyParent;
     private string _category;
     private string _categoryValue;
     private string _description;
     private string _displayName;
     private int _displayOrder;
     private bool _isExpandable;
+    private bool _isReadOnly;
+    private IList<Type> _newItemTypes;
     private IEnumerable<CommandBinding> _commandBindings;
-    private IEnumerable<IPropertyDefinition> _children;
 
     #endregion
 
-    #region Constructors
-
-    internal DescriptorPropertyDefinitionBase( IPropertyParent propertyParent )
+    internal abstract PropertyDescriptor PropertyDescriptor
     {
-      if( propertyParent == null )
-        throw new ArgumentNullException( "propertyParent" );
-
-      _propertyParent = propertyParent;
+      get;
     }
 
-    #endregion
-
     #region Virtual Methods
 
     protected virtual string ComputeCategory()
@@ -77,7 +70,6 @@ protected virtual string ComputeDescription()
     {
       return null;
     }
-
     protected virtual int ComputeDisplayOrder()
     {
       return int.MaxValue;
@@ -88,12 +80,14 @@ protected virtual bool ComputeIsExpandable()
       return false;
     }
 
-    protected virtual void ResetValue()
+    protected virtual IList<Type> ComputeNewItemTypes()
     {
+      return null;
     }
 
-    protected virtual void SetBinding()
+    protected virtual bool ComputeIsReadOnly()
     {
+      return false;
     }
 
     protected virtual bool ComputeCanResetValue()
@@ -101,11 +95,6 @@ protected virtual bool ComputeCanResetValue()
       return false;
     }
 
-    protected virtual IEnumerable<IPropertyDefinition> GenerateChildrenProperties()
-    {
-      return null;
-    }
-
     protected virtual AdvancedOptionsValues ComputeAdvancedOptionsValues()
     {
       return new AdvancedOptionsValues()
@@ -115,46 +104,26 @@ protected virtual AdvancedOptionsValues ComputeAdvancedOptionsValues()
       };
     }
 
-    protected virtual ITypeEditor GetAttributeEditor()
-    {
-      return null;
-    }
-
-    protected virtual string GetPropertyName()
+    protected virtual void ResetValue()
     {
-      return null;
     }
 
-    protected virtual Type GetPropertyType()
-    {
-      return null;
-    }
+    protected abstract BindingBase CreateValueBinding();
 
-    protected virtual string GetPropertyDisplayName()
-    {
-      return null;
-    }
+    #endregion
 
-    protected virtual bool IsPropertyDescriptorReadOnly()
-    {
-      return false;
-    }
+    #region Internal Methods
 
-    protected virtual ITypeEditor CreateDefaultEditor()
+    internal virtual ITypeEditor CreateDefaultEditor()
     {
       return null;
     }
 
-    internal virtual PropertyDescriptor GetPropertyDescriptor()
+    internal virtual ITypeEditor CreateAttributeEditor()
     {
       return null;
     }
 
-
-    #endregion
-
-    #region Internal Methods
-
     internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, DependencyObject dependencyObject, DependencyPropertyDescriptor dpDescriptor, 
                                                 out string imageName, out object tooltip )
     {
@@ -164,7 +133,7 @@ internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, Dependency
       bool isResource = false;
       bool isDynamicResource = false;
 
-      var markupProperty = markupObject.Properties.Where( p => p.Name == GetPropertyName() ).FirstOrDefault();
+      var markupProperty = markupObject.Properties.Where( p => p.Name == PropertyName ).FirstOrDefault();
       if( markupProperty != null )
       {
         //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
@@ -220,11 +189,11 @@ internal void UpdateAdvanceOptionsForItem( MarkupObject markupObject, Dependency
 
     internal AdvancedOptionsValues CreateAdvanceOptionValues( string imageName, object tooltip )
     {
-      string uriPrefix = "/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/";
+      string uriPrefix = "../Images/";
 
       AdvancedOptionsValues values = new AdvancedOptionsValues();
       values.Tooltip = tooltip;
-      values.ImageSource = new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.RelativeOrAbsolute ) );
+      values.ImageSource = new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.Relative ) );
 
       return values;
     }
@@ -236,6 +205,11 @@ internal void UpdateAdvanceOptions()
       AdvancedOptionsTooltip = advancedOptions.Tooltip;
     }
 
+    internal void UpdateValueFromSource()
+    {
+      BindingOperations.GetBindingExpressionBase( this, DescriptorPropertyDefinitionBase.ValueProperty ).UpdateTarget();
+    }
+
 
 
 
@@ -252,6 +226,16 @@ internal object ComputeDescriptionForItem( object item )
               : pd.Description;
     }
 
+    internal object ComputeNewItemTypesForItem( object item )
+    {
+      PropertyDescriptor pd = item as PropertyDescriptor;
+      var attribute = PropertyGridUtilities.GetAttribute<NewItemTypesAttribute>( pd );
+
+      return ( attribute != null ) 
+              ? attribute.Types 
+              : null;
+    }
+
     internal object ComputeDisplayOrderForItem( object item )
     {
       PropertyDescriptor pd = item as PropertyDescriptor;
@@ -280,8 +264,8 @@ private void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventAr
 
     private string ComputeDisplayName()
     {
-      string displayName = GetPropertyDisplayName();
-      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( GetPropertyDescriptor() );
+      string displayName = PropertyDescriptor.DisplayName;
+      var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
       if( ( attribute != null ) && attribute.NeedParenthesis )
       {
         displayName = "(" + displayName + ")";
@@ -290,17 +274,8 @@ private string ComputeDisplayName()
       return displayName;
     }
 
-     private FrameworkElement CreateCustomEditor( EditorDefinition customEditor )
-    {
-      return ( customEditor != null && customEditor.EditorTemplate != null )
-        ? customEditor.EditorTemplate.LoadContent() as FrameworkElement
-        : null;
-    }
-
     #endregion
 
-    #region IPropertyDefinition Properties
-
     #region AdvancedOptionsIcon (DP)
 
     public static readonly DependencyProperty AdvancedOptionsIconProperty =
@@ -355,19 +330,6 @@ public string CategoryValue
       }
     }
 
-    public IEnumerable<IPropertyDefinition> ChildrenDefinitions
-    {
-      get
-      {
-        if( _children == null )
-        {
-          _children = GenerateChildrenProperties();
-        }
-
-        return _children;
-      }
-    }
-
     public IEnumerable<CommandBinding> CommandBindings
     {
       get
@@ -383,7 +345,6 @@ public string DisplayName
         return _displayName;
       }
     }
-
     public string Description
     {
       get
@@ -408,11 +369,36 @@ public bool IsExpandable
       }
     }
 
-    public IPropertyParent PropertyParent
+    public bool IsReadOnly
     {
       get
       {
-        return _propertyParent;
+        return _isReadOnly;
+      }
+    }
+
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return _newItemTypes;
+      }
+    }
+
+    public string PropertyName
+    {
+      get
+      {
+        // A common property which is present in all selectedObjects will always have the same name.
+        return PropertyDescriptor.Name;
+      }
+    }
+
+    public Type PropertyType
+    {
+      get
+      {
+        return PropertyDescriptor.PropertyType;
       }
     }
 
@@ -446,90 +432,25 @@ private void OnValueChanged( object oldValue, object newValue )
 
     #endregion //Value Property
 
-    #endregion IPropertyDefinition Properties
-
-    #region IPropertyParent Properties
-
-    public object ValueInstance
-    {
-      get
-      {
-        return this.Value;
-      }
-    }
-
-    public EditorDefinitionCollection EditorDefinitions
-    {
-      get
-      {
-        return PropertyParent.EditorDefinitions;
-      }
-    }
-
-    #endregion
-
-    #region IPropertyDefinition Methods
-
-    public FrameworkElement GenerateEditorElement( PropertyItem propertyItem )
-    {
-      FrameworkElement editorElement = null;
-
-      // Priority #1: CustomEditors based on the Attribute
-      ITypeEditor editor = GetAttributeEditor();
-      if( editor != null )
-        editorElement = editor.ResolveEditor( propertyItem );
-
-      if( _propertyParent.EditorDefinitions != null )
-      {
-        // Priority #2: Custom Editors based on the name (same for all PropertyDescriptors).
-        if( editorElement == null )
-          editorElement = CreateCustomEditor( _propertyParent.EditorDefinitions[ GetPropertyName() ] );
-
-        // Priority #3: Custom Editors based on the type (same for all PropertyDescriptors)
-        if( editorElement == null )
-          editorElement = CreateCustomEditor( _propertyParent.EditorDefinitions[ GetPropertyType() ] );
-      }
-
-      if( editorElement == null )
-      {
-        // Priority #4: Default Editor. Readonly properties use a TextBox
-        if( IsPropertyDescriptorReadOnly() )
-          editor = new TextBlockEditor();
-
-        // Fallback: Use a default type Editor.
-        if( editor == null )
-        {
-          editor = CreateDefaultEditor();
-        }
-
-        Debug.Assert( editor != null );
-
-        editorElement = editor.ResolveEditor( propertyItem );
-      }
-
-      return editorElement;
-    }
-
     public void InitProperties()
     {
+      // Do "IsReadOnly" and PropertyName first since the others may need that value.
+      _isReadOnly = ComputeIsReadOnly();
       _category = ComputeCategory();
       _categoryValue = ComputeCategoryValue();
       _description = ComputeDescription();
       _displayName = ComputeDisplayName();
       _displayOrder = ComputeDisplayOrder();
       _isExpandable = ComputeIsExpandable();
+      _newItemTypes = ComputeNewItemTypes();
       _commandBindings = new CommandBinding[] { new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) };
 
       UpdateAdvanceOptions();
 
-      SetBinding();
+      BindingBase valueBinding = this.CreateValueBinding();
+      BindingOperations.SetBinding( this, DescriptorPropertyDefinitionBase.ValueProperty, valueBinding );
     }
 
-    #endregion IPropertyDefinition Methods
-
-
-
-
     #region AdvancedOptionsValues struct (Internal )
 
     internal struct AdvancedOptionsValues
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
index 3d861ba59..862a309e7 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
@@ -1,33 +1,56 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class EditorDefinition
+  [Obsolete(@"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx)]
+  public class EditorDefinition : EditorTemplateDefinition
   {
+    private const string UsageEx = " (XAML Ex: <t:EditorTemplateDefinition TargetProperties=\"FirstName,LastName\" .../> OR <t:EditorTemplateDefinition TargetProperties=\"{x:Type l:MyType}\" .../> )";
+
+    public EditorDefinition()
+    {
+      const string usageErr = "{0} is obsolete. Instead use {1}.";
+      System.Diagnostics.Trace.TraceWarning( string.Format( usageErr, typeof( EditorDefinition ), typeof( EditorTemplateDefinition ) ) + UsageEx );
+    }
+
+    /// <summary>
+    /// Gets or sets the template of the editor.
+    /// This Property is part of the obsolete EditorDefinition class.
+    /// Use EditorTemplateDefinition class and the Edit<b>ing</b>Template property.
+    /// </summary>
     public DataTemplate EditorTemplate
     {
       get;
       set;
     }
 
+
     private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
+    /// <summary>
+    /// List the PropertyDefinitions that identify the properties targeted by the EditorTemplate.
+    /// This Property is part of the obsolete EditorDefinition class.
+    /// Use "EditorTemplateDefinition" class and the "TargetProperties" property<br/>
+    /// XAML Ex.: &lt;t:EditorTemplateDefinition TargetProperties="FirstName,LastName" .../&gt;
+    /// </summary>
     public PropertyDefinitionCollection PropertiesDefinitions
     {
       get
@@ -45,5 +68,33 @@ public Type TargetType
       get;
       set;
     }
+
+    internal override void Lock()
+    {
+      const string usageError = @"Use a EditorTemplateDefinition instead of EditorDefinition in order to use the '{0}' property.";
+      if( this.EditingTemplate != null )
+        throw new InvalidOperationException( string.Format( usageError, "EditingTemplate" ) );
+
+      if( this.TargetProperties != null && this.TargetProperties.Count > 0)
+        throw new InvalidOperationException( string.Format( usageError, "TargetProperties" ) );
+
+      List<object> properties = new List<object>();
+      if( this.PropertiesDefinitions != null )
+      {
+        foreach( PropertyDefinition def in this.PropertiesDefinitions )
+        {
+          if( def.TargetProperties != null )
+          {
+            properties.AddRange( def.TargetProperties.Cast<object>() );
+          }
+        }
+      }
+
+      this.TargetProperties = properties;
+      this.EditingTemplate = this.EditorTemplate;
+
+      base.Lock();
+    }
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs
deleted file mode 100644
index 83d061d83..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinitionCollection.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System;
-using System.Collections.ObjectModel;
-using System.Linq;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
-  {
-    public EditorDefinition this[ string propertyName ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.PropertiesDefinitions.Where( x => x.Name == propertyName ).Any() )
-            return item;
-        }
-
-        return null;
-      }
-    }
-
-    public EditorDefinition this[ Type targetType ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.TargetType == targetType )
-            return item;
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
index a5bbd5aed..ba4b4855a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
index e57651c51..70bafede4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <UserControl x:Class="Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
index b2a2dcc05..5e161a772 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
@@ -34,7 +34,7 @@ public CollectionEditor()
 
     private void Button_Click( object sender, RoutedEventArgs e )
     {
-      CollectionControlDialog editor = new CollectionControlDialog( _item.PropertyType );
+      CollectionControlDialog editor = new CollectionControlDialog( _item.PropertyType, _item.DescriptorDefinition.NewItemTypes );
       Binding binding = new Binding( "Value" );
       binding.Source = _item;
       binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
index bd5b8f95c..d3c6e68ea 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
@@ -22,6 +22,7 @@ protected override void SetControlProperties()
     {
       Editor.BorderThickness = new System.Windows.Thickness( 0 );
       Editor.DisplayColorAndName = true;
+      Editor.Style = PropertyGridUtilities.ColorPickerStyle;
     }
     protected override void SetValueDependencyProperty()
     {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
index 5a1b3a8d0..3e209caed 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -1,20 +1,21 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
+using System.Collections;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
@@ -25,13 +26,18 @@ protected override void SetValueDependencyProperty()
       ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
     }
 
+    protected override void SetControlProperties()
+    {
+      Editor.Style = PropertyGridUtilities.ComboBoxStyle;
+    }
+
     protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
       SetItemsSource( propertyItem );
       base.ResolveValueBinding( propertyItem );
     }
 
-    protected abstract IList<object> CreateItemsSource( PropertyItem propertyItem );
+    protected abstract IEnumerable CreateItemsSource( PropertyItem propertyItem );
 
     private void SetItemsSource( PropertyItem propertyItem )
     {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
index b545db2df..a607d4811 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -1,30 +1,31 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
+using System.Collections;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class EnumComboBoxEditor : ComboBoxEditor
   {
-    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
     {
       return GetValues( propertyItem.PropertyType );
     }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
index 48b43c062..ffefd4541 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -1,91 +1,42 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class FontComboBoxEditor : ComboBoxEditor
   {
-    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
+    protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
     {
       if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return GetFontFamilies();
+        return FontUtilities.Families;
       else if( propertyItem.PropertyType == typeof( FontWeight ) )
-        return GetFontWeights();
+        return FontUtilities.Weights;
       else if( propertyItem.PropertyType == typeof( FontStyle ) )
-        return GetFontStyles();
+        return FontUtilities.Styles;
       else if( propertyItem.PropertyType == typeof( FontStretch ) )
-        return GetFontStretches();
+        return FontUtilities.Stretches;
 
       return null;
     }
-
-    private static IList<object> GetFontFamilies()
-    {
-#if !VS2008
-      return Fonts.SystemFontFamilies.ToList<object>();
-#else
-      return Fonts.SystemFontFamilies.Cast<object>().ToList();
-#endif
-    }
-
-    private static IList<object> GetFontWeights()
-    {
-      return new List<object>()
-            {
-                FontWeights.Black, 
-                FontWeights.Bold, 
-                FontWeights.ExtraBlack, 
-                FontWeights.ExtraBold,
-                FontWeights.ExtraLight, 
-                FontWeights.Light, 
-                FontWeights.Medium, 
-                FontWeights.Normal, 
-                FontWeights.SemiBold,
-                FontWeights.Thin
-            };
-    }
-
-    private static IList<object> GetFontStyles()
-    {
-      return new List<object>()
-            {
-                FontStyles.Italic,
-                FontStyles.Normal
-            };
-    }
-
-    private static IList<object> GetFontStretches()
-    {
-      return new List<object>()
-            {
-                FontStretches.Condensed,
-                FontStretches.Expanded,
-                FontStretches.ExtraCondensed,
-                FontStretches.ExtraExpanded,
-                FontStretches.Normal,
-                FontStretches.SemiCondensed,
-                FontStretches.SemiExpanded,
-                FontStretches.UltraCondensed,
-                FontStretches.UltraExpanded
-            };
-    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
index 29a7a4b19..bfeae6ab3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
index 5592885eb..10ef02066 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
@@ -43,6 +43,7 @@ protected override void SetControlProperties()
     {
       Editor.DisplayMemberPath = "DisplayName";
       Editor.SelectedValuePath = "Value";
+      Editor.Style = PropertyGridUtilities.ComboBoxStyle;
     }
 
     private void SetItemsSource()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
index c914f8647..da59a575f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index 611fc11a8..454b97c59 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
index 17cd92c0c..12a75235a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Controls;
 
@@ -22,7 +22,7 @@ public class TextBoxEditor : TypeEditor<WatermarkTextBox>
   {
     protected override void SetControlProperties()
     {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.Style = PropertyGridUtilities.NoBorderControlStyle;
     }
 
     protected override void SetValueDependencyProperty()
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
index 4512437bb..623cfef8e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
@@ -1,48 +1,37 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Globalization;
 using System.Windows.Data;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
   public class TimeSpanEditor : DateTimeUpDownEditor
   {
-    private sealed class TimeSpanConverter : IValueConverter
-    {
-      object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return DateTime.Today + ( TimeSpan )value;
-      }
-
-      object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
-      {
-        return ( ( DateTime )value ).TimeOfDay;
-      }
-    }
-
     protected override void SetControlProperties()
     {
+      base.SetControlProperties();
       Editor.Format = DateTimeFormat.LongTime;
     }
 
     protected override IValueConverter CreateValueConverter()
     {
-      return new TimeSpanConverter();
+      return new EditorTimeSpanConverter();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
index e711790d1..743c09a5f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Data;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
index 4b4797211..82c39d2f2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using Xceed.Wpf.Toolkit.Primitives;
 using System;
@@ -22,7 +22,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
   {
     protected override void SetControlProperties()
     {
-      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.TextAlignment = System.Windows.TextAlignment.Left;
+      Editor.Style = PropertyGridUtilities.GetUpDownBaseStyle<TType>();
     }
     protected override void SetValueDependencyProperty()
     {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
new file mode 100644
index 000000000..86be8a120
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
@@ -0,0 +1,29 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal struct FilterInfo
+  {
+    public string InputString;
+    public Predicate<object> Predicate;
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
new file mode 100644
index 000000000..d2aeada1f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
@@ -0,0 +1,47 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+
+using System.Collections.Generic;
+using System.Windows.Controls;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Data;
+using System;
+using System.Windows;
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal interface IPropertyContainer
+  {
+
+
+
+
+    ContainerHelperBase ContainerHelper { get; }
+
+    Style PropertyContainerStyle { get; }
+
+    EditorDefinitionCollection EditorDefinitions { get; }
+
+    PropertyDefinitionCollection PropertyDefinitions { get; }
+
+    bool IsCategorized { get; }
+
+    bool AutoGenerateProperties { get; }
+
+    FilterInfo FilterInfo { get; }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs
deleted file mode 100644
index 97beaf70e..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyDefinition.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Input;
-using System.Windows.Media;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal interface IPropertyDefinition
-  {
-    ImageSource AdvancedOptionsIcon { get; }
-    object AdvancedOptionsTooltip { get; }
-    string Category { get; }
-    string CategoryValue { get; }
-    IEnumerable<IPropertyDefinition> ChildrenDefinitions { get; }
-    IEnumerable<CommandBinding> CommandBindings { get; }
-    string Description { get; }
-    string DisplayName { get; }
-    int DisplayOrder { get; }
-    bool IsExpandable { get; }
-    IPropertyParent PropertyParent { get; }
-    object Value { get; set; }
-
-    FrameworkElement GenerateEditorElement( PropertyItem propertyItem );
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs
deleted file mode 100644
index 53148edcd..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyParent.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-
-using System.Collections.Generic;
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  internal interface IPropertyParent
-  {
-    object ValueInstance { get; }
-
-    EditorDefinitionCollection EditorDefinitions { get; }
-
-
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
new file mode 100644
index 000000000..fcd3ad8d4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -0,0 +1,129 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal class ObjectContainerHelper : ObjectContainerHelperBase
+  {
+    private object _selectedObject;
+
+    public ObjectContainerHelper( IPropertyContainer propertyContainer, object selectedObject )
+      : base( propertyContainer )
+    {
+      _selectedObject = selectedObject;
+    }
+
+    private object SelectedObject
+    {
+      get
+      {
+        return _selectedObject;
+      }
+    }
+
+    protected override string GetDefaultPropertyName()
+    {
+      object selectedObject = SelectedObject;
+      return ( selectedObject != null ) ? ObjectContainerHelperBase.GetDefaultPropertyName( SelectedObject ) : ( string )null;
+    }
+
+    protected override IEnumerable<PropertyItem> GenerateSubPropertiesCore()
+    {
+      var propertyItems = new List<PropertyItem>();
+
+      if( SelectedObject != null )
+      {
+        try
+        {
+          List<PropertyDescriptor> descriptors = ObjectContainerHelperBase.GetPropertyDescriptors( SelectedObject );
+          if( !PropertyContainer.AutoGenerateProperties )
+          {
+            List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
+            if( PropertyContainer.PropertyDefinitions != null )
+            {
+              foreach( PropertyDefinition pd in PropertyContainer.PropertyDefinitions )
+              {
+                foreach( object targetProperty in pd.TargetProperties )
+                {
+                  PropertyDescriptor descriptor = null;
+                  // If the target is a string, compare it with the property name.
+                  var propName = targetProperty as string;
+                  if( propName != null )
+                  {
+                    descriptor = descriptors.FirstOrDefault( d => d.Name == propName );
+                  }
+
+                  // If the target is a Type, compare it with the property type.
+                  var propType = targetProperty as Type;
+                  if( propType != null )
+                  {
+                    descriptor = descriptors.FirstOrDefault( d => d.PropertyType == propType );
+                  }
+
+                  if( descriptor != null )
+                  {
+                    specificProperties.Add( descriptor );
+                    descriptors.Remove( descriptor );
+                  }
+                }
+              }
+            }
+
+            descriptors = specificProperties;
+          }
+
+          foreach( PropertyDescriptor descriptor in descriptors )
+          {
+            if( descriptor.IsBrowsable )
+            {
+              propertyItems.Add( CreatePropertyItem( descriptor ) );
+            }
+          }
+        }
+        catch( Exception )
+        {
+          //TODO: handle this some how
+        }
+      }
+
+      return propertyItems;
+    }
+
+
+    private PropertyItem CreatePropertyItem( PropertyDescriptor property )
+    {
+      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject );
+      definition.InitProperties();
+      PropertyItem propertyItem = new PropertyItem( definition );
+      Debug.Assert( SelectedObject != null );
+      propertyItem.Instance = SelectedObject;
+      return propertyItem;
+    }
+
+
+
+
+
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
new file mode 100644
index 000000000..8418810ff
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -0,0 +1,390 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Windows;
+using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+using System.Collections;
+using System.Collections.ObjectModel;
+using System.Windows.Controls.Primitives;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  internal abstract class ObjectContainerHelperBase : ContainerHelperBase
+  {
+    // This is needed to work around the ItemsControl behavior.
+    // When ItemsControl is preparing its containers, it appears 
+    // that calling Refresh() on the CollectionView bound to
+    // the ItemsSource prevents the items from being displayed.
+    // This patch is to avoid such a behavior.
+    private bool _isPreparingItemFlag = false;
+    private PropertyItemCollection _propertyItemCollection;
+
+    public ObjectContainerHelperBase( IPropertyContainer propertyContainer)
+      : base( propertyContainer )
+    {
+      _propertyItemCollection = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
+      UpdateFilter();
+      UpdateCategorization();
+
+    }
+
+    public override IList Properties
+    {
+      get { return _propertyItemCollection; }
+    }
+
+    private PropertyItem DefaultProperty
+    {
+      get 
+      {
+        PropertyItem defaultProperty = null;
+        var defaultName = this.GetDefaultPropertyName();
+        if( defaultName != null )
+        {
+          defaultProperty = _propertyItemCollection
+            .FirstOrDefault( ( prop ) => object.Equals( defaultName, prop.PropertyDescriptor.Name ) );
+        }
+
+        return defaultProperty;
+      }
+    }
+
+
+    protected PropertyItemCollection PropertyItems
+    {
+      get
+      {
+        return _propertyItemCollection;
+      }
+    }
+
+    public override PropertyItemBase ContainerFromItem( object item )
+    {
+      if( item == null )
+        return null;
+      // Exception case for ObjectContainerHelperBase. The "Item" may sometimes
+      // be identified as a string representing the property name or
+      // the PropertyItem itself.
+      Debug.Assert( item is PropertyItem || item is string );
+
+      var propertyItem = item as PropertyItem;
+      if( propertyItem != null )
+        return propertyItem;
+
+
+      var propertyStr = item as string;
+      if( propertyStr != null )
+        return PropertyItems.FirstOrDefault( ( prop ) => propertyStr == prop.PropertyDescriptor.Name );
+
+      return null;
+    }
+
+    public override object ItemFromContainer( PropertyItemBase container )
+    {
+      // Since this call is only used to update the PropertyGrid.SelectedProperty property,
+      // return the PropertyName.
+      var propertyItem = container as PropertyItem;
+      if( propertyItem == null )
+        return null;
+
+      return propertyItem.PropertyDescriptor.Name;
+    }
+
+    public override void  UpdateValuesFromSource()
+    {
+      foreach( PropertyItem item in PropertyItems )
+      {
+        item.DescriptorDefinition.UpdateValueFromSource();
+        item.ContainerHelper.UpdateValuesFromSource();
+      }
+    }
+
+    public void GenerateProperties()
+    {
+      if( PropertyItems.Count == 0 )
+      {
+        this.RegenerateProperties();
+      }
+    }
+
+    protected override void OnFilterChanged()
+    {
+      this.UpdateFilter();
+    }
+
+    protected override void OnCategorizationChanged()
+    {
+      UpdateCategorization();
+    }
+
+    protected override void OnAutoGeneratePropertiesChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    protected override void OnEditorDefinitionsChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    protected override void OnPropertyDefinitionsChanged()
+    {
+      this.RegenerateProperties();
+    }
+
+    private void UpdateFilter()
+    {
+      FilterInfo filterInfo = PropertyContainer.FilterInfo;
+
+      PropertyItems.FilterPredicate = filterInfo.Predicate
+        ?? PropertyItemCollection.CreateFilter( filterInfo.InputString );
+    }
+
+    private void UpdateCategorization()
+    {
+      _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription() );
+    }
+
+    private GroupDescription ComputeCategoryGroupDescription()
+    {
+      if( !PropertyContainer.IsCategorized )
+        return null;
+      return new PropertyGroupDescription( PropertyItemCollection.CategoryPropertyName );
+    }
+
+    private string GetCategoryGroupingPropertyName()
+    {
+      var propGroup = this.ComputeCategoryGroupDescription() as PropertyGroupDescription;
+      return ( propGroup != null ) ? propGroup.PropertyName : null;
+    }
+
+    private void OnChildrenPropertyChanged( object sender, PropertyChangedEventArgs e )
+    {
+      if( ObjectContainerHelperBase.IsItemOrderingProperty( e.PropertyName )
+        || this.GetCategoryGroupingPropertyName() == e.PropertyName )
+      {
+        // Refreshing the view while Containers are generated will throw an exception
+        if( this.ChildrenItemsControl.ItemContainerGenerator.Status != GeneratorStatus.GeneratingContainers
+          && !_isPreparingItemFlag )
+        {
+          PropertyItems.RefreshView();
+        }
+      }
+    }
+
+    protected abstract string GetDefaultPropertyName();
+
+    protected abstract IEnumerable<PropertyItem> GenerateSubPropertiesCore();
+
+    private void RegenerateProperties()
+    {
+      IEnumerable<PropertyItem> subProperties = this.GenerateSubPropertiesCore();
+
+      var uiParent = PropertyContainer as UIElement;
+
+      foreach( var propertyItem in subProperties )
+      {
+        this.InitializePropertyItem( propertyItem );
+      }
+
+      //Remove the event callback from the previous children (if any)
+      foreach( var propertyItem in PropertyItems )
+      {
+        propertyItem.PropertyChanged -= OnChildrenPropertyChanged;
+      }
+
+
+      PropertyItems.UpdateItems( subProperties );
+
+      //Add the event callback to the new childrens
+      foreach( var propertyItem in PropertyItems )
+      {
+        propertyItem.PropertyChanged += OnChildrenPropertyChanged;
+      }
+
+      // Update the selected property on the property grid only.
+      PropertyGrid propertyGrid = PropertyContainer as PropertyGrid;
+      if( propertyGrid != null )
+      {
+        propertyGrid.SelectedPropertyItem = this.DefaultProperty;
+      }
+    }
+
+    protected static List<PropertyDescriptor> GetPropertyDescriptors( object instance )
+    {
+      PropertyDescriptorCollection descriptors;
+
+      TypeConverter tc = TypeDescriptor.GetConverter( instance );
+      if( tc == null || !tc.GetPropertiesSupported() )
+      {
+        if( instance is ICustomTypeDescriptor )
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
+        else
+          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
+      }
+      else
+      {
+        descriptors = tc.GetProperties( instance );
+      }
+
+      return ( descriptors != null )
+        ? descriptors.Cast<PropertyDescriptor>().ToList()
+        : null;
+    }
+
+    private void InitializePropertyItem( PropertyItem propertyItem )
+    {
+      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
+      propertyItem.PropertyDescriptor = pd.PropertyDescriptor;
+
+      propertyItem.IsReadOnly = pd.IsReadOnly;
+      propertyItem.DisplayName = pd.DisplayName;
+      propertyItem.Description = pd.Description;
+      propertyItem.Category = pd.Category;
+      propertyItem.PropertyOrder = pd.DisplayOrder;
+      propertyItem.IsExpandable = pd.IsExpandable;
+
+      //These properties can vary with the value. They need to be bound.
+      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsIconProperty, pd, () => pd.AdvancedOptionsIcon, BindingMode.OneWay );
+      SetupDefinitionBinding( propertyItem, PropertyItemBase.AdvancedOptionsTooltipProperty, pd, () => pd.AdvancedOptionsTooltip, BindingMode.OneWay );
+      SetupDefinitionBinding( propertyItem, PropertyItem.ValueProperty, pd, () => pd.Value, BindingMode.TwoWay );
+
+      if( pd.CommandBindings != null )
+      {
+        foreach( CommandBinding commandBinding in pd.CommandBindings )
+        {
+          propertyItem.CommandBindings.Add( commandBinding );
+        }
+      }
+    }
+
+    private void SetupDefinitionBinding<T>(
+      PropertyItem propertyItem,
+      DependencyProperty itemProperty,
+      DescriptorPropertyDefinitionBase pd,
+      Expression<Func<T>> definitionProperty,
+      BindingMode bindingMode )
+    {
+      string sourceProperty = ReflectionHelper.GetPropertyOrFieldName( definitionProperty );
+      Binding binding = new Binding( sourceProperty )
+      {
+        Source = pd,
+        Mode = bindingMode
+      };
+
+      propertyItem.SetBinding( itemProperty, binding );
+    }
+
+    private FrameworkElement GenerateChildrenEditorElement( PropertyItem propertyItem )
+    {
+      FrameworkElement editorElement = null;
+      DescriptorPropertyDefinitionBase pd = propertyItem.DescriptorDefinition;
+      object definitionKey = null;
+      Type definitionKeyAsType = definitionKey as Type;
+
+      ITypeEditor editor = pd.CreateAttributeEditor();
+      if( editor != null )
+        editorElement = editor.ResolveEditor( propertyItem );
+
+
+      if( editorElement == null && definitionKey == null )
+        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyDescriptor.Name, propertyItem );
+
+      if( editorElement == null && definitionKeyAsType == null )
+        editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyType, propertyItem );
+
+      if( editorElement == null )
+      {
+        if( pd.IsReadOnly )
+          editor = new TextBlockEditor();
+
+        // Fallback: Use a default type editor.
+        if( editor == null )
+        {
+          editor = ( definitionKeyAsType != null )
+          ? PropertyGridUtilities.CreateDefaultEditor( definitionKeyAsType, null )
+          : pd.CreateDefaultEditor();
+        }
+
+        Debug.Assert( editor != null );
+
+        editorElement = editor.ResolveEditor( propertyItem );
+      }
+
+      return editorElement;
+    }
+
+    public override void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+      _isPreparingItemFlag = true;
+      base.PrepareChildrenPropertyItem( propertyItem, item );
+
+      if( propertyItem.Editor == null )
+      {
+        FrameworkElement editor = this.GenerateChildrenEditorElement( ( PropertyItem )propertyItem );
+        if( editor != null )
+        {
+          // Tag the editor as generated to know if we should clear it.
+          ContainerHelperBase.SetIsGenerated( editor, true );
+          propertyItem.Editor = editor;
+        }
+      }
+      _isPreparingItemFlag = false;
+    }
+
+    public override void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
+    {
+      if( propertyItem.Editor != null 
+        && ContainerHelperBase.GetIsGenerated( propertyItem.Editor ) )
+      {
+        propertyItem.Editor = null;
+      }
+
+      base.ClearChildrenPropertyItem( propertyItem, item );
+    }
+
+    public override Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem )
+    {
+      Binding binding = new Binding( "Value" );
+      binding.Mode = ( ( ( PropertyItem )propertyItem ).IsReadOnly ) ? BindingMode.OneWay : BindingMode.TwoWay;
+      return binding;
+    }
+
+    protected static string GetDefaultPropertyName( object instance )
+    {
+      AttributeCollection attributes = TypeDescriptor.GetAttributes( instance );
+      DefaultPropertyAttribute defaultPropertyAttribute = ( DefaultPropertyAttribute )attributes[ typeof( DefaultPropertyAttribute ) ];
+      return defaultPropertyAttribute != null ? defaultPropertyAttribute.Name : null;
+    }
+
+    private static bool IsItemOrderingProperty( string propertyName )
+    {
+      return string.Equals( propertyName, PropertyItemCollection.DisplayNamePropertyName )
+        || string.Equals( propertyName, PropertyItemCollection.CategoryOrderPropertyName )
+        || string.Equals( propertyName, PropertyItemCollection.PropertyOrderPropertyName );
+    }
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
index 2db8dfb1a..cc4aaaf13 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -1,27 +1,56 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
+using System;
+using System.Collections.Generic;
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class PropertyDefinition
+  public class PropertyDefinition : PropertyDefinitionBase
   {
+    private string _name;
+
+    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
     public string Name
     {
-      get;
-      set;
+      get { return _name; }
+      set 
+      {
+        const string usageError = "{0}: \'Name\' property is obsolete. Instead use \'TargetProperties\'. (XAML example: <t:PropertyDefinition TargetProperties=\"FirstName,LastName\" />)";
+        System.Diagnostics.Trace.TraceWarning( usageError, typeof( PropertyDefinition ) );
+        _name = value; 
+      }
+    }
+
+    internal override void Lock()
+    {
+      if( _name != null
+        && this.TargetProperties != null
+        && this.TargetProperties.Count > 0 )
+      {
+        throw new InvalidOperationException(
+          string.Format(
+            @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", 
+            typeof( PropertyDefinition ) ) );
+      }
+
+      if( _name != null )
+      {
+        this.TargetProperties = new List<object>() { _name };
+      }
+      base.Lock();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
new file mode 100644
index 000000000..2b1a39623
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
@@ -0,0 +1,61 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.ObjectModel;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  public class PropertyDefinitionCollection : PropertyDefinitionBaseCollection<PropertyDefinition> { }
+  public class EditorDefinitionCollection : PropertyDefinitionBaseCollection<EditorDefinitionBase> { }
+
+  public abstract class PropertyDefinitionBaseCollection<T> : ObservableCollection<T> where T : PropertyDefinitionBase
+  {
+    internal PropertyDefinitionBaseCollection() { }
+
+    public T this[ object propertyId ]
+    {
+      get
+      {
+        foreach( var item in Items )
+        {
+          if( item.TargetProperties.Contains( propertyId ) )
+            return item;
+        }
+
+        return null;
+      }
+    }
+
+    protected override void InsertItem( int index, T item )
+    {
+      if( item == null )
+        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
+
+      item.Lock();
+      base.InsertItem( index, item );
+    }
+
+    protected override void SetItem( int index, T item )
+    {
+      if( item == null )
+        throw new InvalidOperationException( @"Cannot insert null items in the collection." );
+
+      item.Lock();
+      base.SetItem( index, item );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
deleted file mode 100644
index 182479781..000000000
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-﻿/************************************************************************
-
-   Extended WPF Toolkit
-
-   Copyright (C) 2010-2012 Xceed Software Inc.
-
-   This program is provided to you under the terms of the Microsoft Public
-   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
-
-   For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
-
-   Visit http://xceed.com and follow @datagrid on Twitter
-
-  **********************************************************************/
-
-using System.Collections.ObjectModel;
-
-namespace Xceed.Wpf.Toolkit.PropertyGrid
-{
-  public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
-  {
-    public PropertyDefinition this[ string propertyName ]
-    {
-      get
-      {
-        foreach( var item in Items )
-        {
-          if( item.Name == propertyName )
-            return item;
-        }
-
-        return null;
-      }
-    }
-  }
-}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index 21df3d4d1..8114be9b9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -29,22 +29,32 @@ This program is provided to you under the terms of the Microsoft Public
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using System.Collections.ObjectModel;
 using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Reflection;
+using System.Linq.Expressions;
+using System.Windows.Markup;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   [TemplatePart( Name = PART_DragThumb, Type = typeof( Thumb ) )]
-  public class PropertyGrid : Control, ISupportInitialize, IPropertyParent
+  [TemplatePart( Name = PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
+  [StyleTypedProperty( Property = "PropertyContainerStyle", StyleTargetType = typeof( PropertyItemBase ) )]
+  public class PropertyGrid : Control, ISupportInitialize, IPropertyContainer, INotifyPropertyChanged
   {
     private const string PART_DragThumb = "PART_DragThumb";
+    internal const string PART_PropertyItemsControl = "PART_PropertyItemsControl";
+    private static readonly ComponentResourceKey SelectedObjectAdvancedOptionsMenuKey = new ComponentResourceKey( typeof( PropertyGrid ), "SelectedObjectAdvancedOptionsMenu" );
 
     #region Members
 
     private Thumb _dragThumb;
     private bool _hasPendingSelectedObjectChanged;
     private int _initializationCount;
-    private PropertyItemCollection _properties;
+    private ContainerHelperBase _containerHelper;
     private PropertyDefinitionCollection _propertyDefinitions;
     private EditorDefinitionCollection _editorDefinitions;
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _propertyDefinitionsListener;
+    private WeakEventListener<NotifyCollectionChangedEventArgs> _editorDefinitionsListener;
 
     #endregion //Members
 
@@ -69,7 +79,7 @@ public ContextMenu AdvancedOptionsMenu
 
     #region AutoGenerateProperties
 
-    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnAutoGeneratePropertiesChanged ) );
+    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
     public bool AutoGenerateProperties
     {
       get
@@ -82,11 +92,6 @@ public bool AutoGenerateProperties
       }
     }
 
-    private static void OnAutoGeneratePropertiesChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      ( ( PropertyGrid )o ).UpdateProperties( true );
-    }
-
     #endregion //AutoGenerateProperties
 
     #region ShowSummary
@@ -116,26 +121,29 @@ public EditorDefinitionCollection EditorDefinitions
       }
       set
       {
-        EditorDefinitionCollection oldValue = _editorDefinitions;
-        _editorDefinitions = value;
-        this.OnEditorDefinitionsChanged( oldValue, value );
+        if( _editorDefinitions != value )
+        {
+          EditorDefinitionCollection oldValue = _editorDefinitions;
+          _editorDefinitions = value;
+          this.OnEditorDefinitionsChanged( oldValue, value );
+        }
       }
     }
 
     protected virtual void OnEditorDefinitionsChanged( EditorDefinitionCollection oldValue, EditorDefinitionCollection newValue )
     {
       if( oldValue != null )
-        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+        CollectionChangedEventManager.RemoveListener( oldValue, _editorDefinitionsListener );
 
       if( newValue != null )
-        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnEditorDefinitionsCollectionChanged );
+        CollectionChangedEventManager.AddListener( newValue, _editorDefinitionsListener );
 
-      UpdateProperties( true );
+      this.Notify( this.PropertyChanged, () => this.EditorDefinitions );
     }
 
     private void OnEditorDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      UpdateProperties( true );
+      _containerHelper.NotifyEditorDefinitionsCollectionChanged();
     }
 
     #endregion //EditorDefinitions
@@ -164,7 +172,9 @@ private static void OnFilterChanged( DependencyObject o, DependencyPropertyChang
 
     protected virtual void OnFilterChanged( string oldValue, string newValue )
     {
-      Properties.Filter( newValue );
+      // The Filter property affects the resulting FilterInfo of IPropertyContainer. Raise an event corresponding
+      // to this property.
+      this.Notify( this.PropertyChanged, () => ( ( IPropertyContainer )this ).FilterInfo );
     }
 
     #endregion //Filter
@@ -210,13 +220,30 @@ private static void OnIsCategorizedChanged( DependencyObject o, DependencyProper
 
     protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
     {
-      this.UpdateProperties( false );
       this.UpdateThumb();
-
     }
 
     #endregion //IsCategorized
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     #region NameColumnWidth
 
     public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0, OnNameColumnWidthChanged ) );
@@ -249,16 +276,53 @@ protected virtual void OnNameColumnWidthChanged( double oldValue, double newValu
 
     #region Properties
 
-    public PropertyItemCollection Properties
+    public IList Properties
     {
       get
       {
-        return _properties;
+        return _containerHelper.Properties;
       }
     }
 
     #endregion //Properties
 
+
+
+
+
+
+
+
+    #region PropertyContainerStyle
+
+    /// <summary>
+    /// Identifies the PropertyContainerStyle dependency property
+    /// </summary>
+    public static readonly DependencyProperty PropertyContainerStyleProperty =
+        DependencyProperty.Register( "PropertyContainerStyle", typeof( Style ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnPropertyContainerStyleChanged ) );
+
+    /// <summary>
+    /// Gets or sets the style that will be applied to all PropertyItemBase instances displayed in the property grid.
+    /// </summary>
+    public Style PropertyContainerStyle
+    {
+      get { return ( Style )GetValue( PropertyContainerStyleProperty ); }
+      set { SetValue( PropertyContainerStyleProperty, value ); }
+    }
+
+    private static void OnPropertyContainerStyleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var owner = o as PropertyGrid;
+      if( owner != null )
+        owner.OnPropertyContainerStyleChanged( ( Style )e.OldValue, ( Style )e.NewValue );
+    }
+
+    protected virtual void OnPropertyContainerStyleChanged( Style oldValue, Style newValue )
+    {
+    }
+
+    #endregion //PropertyContainerStyle
+
     #region PropertyDefinitions
 
     public PropertyDefinitionCollection PropertyDefinitions
@@ -269,26 +333,29 @@ public PropertyDefinitionCollection PropertyDefinitions
       }
       set
       {
-        PropertyDefinitionCollection oldValue = _propertyDefinitions;
-        _propertyDefinitions = value;
-        this.OnPropertyDefinitionsChanged( oldValue, value );
+        if( _propertyDefinitions != value )
+        {
+          PropertyDefinitionCollection oldValue = _propertyDefinitions;
+          _propertyDefinitions = value;
+          this.OnPropertyDefinitionsChanged( oldValue, value );
+        }
       }
     }
 
     protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
     {
       if( oldValue != null )
-        oldValue.CollectionChanged -= new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+        CollectionChangedEventManager.RemoveListener( oldValue, _propertyDefinitionsListener );
 
       if( newValue != null )
-        newValue.CollectionChanged += new NotifyCollectionChangedEventHandler( OnPropertyDefinitionsCollectionChanged );
+        CollectionChangedEventManager.AddListener( newValue, _propertyDefinitionsListener );
 
-      UpdateProperties( true );
+      this.Notify( this.PropertyChanged, () => this.PropertyDefinitions );
     }
 
     private void OnPropertyDefinitionsCollectionChanged( object sender, NotifyCollectionChangedEventArgs e )
     {
-      UpdateProperties( true );
+      _containerHelper.NotifyPropertyDefinitionsCollectionChanged();
     }
 
     #endregion //PropertyDefinitions
@@ -341,7 +408,7 @@ protected virtual void OnSelectedObjectChanged( object oldValue, object newValue
         return;
       }
 
-      this.UpdateProperties( true );
+      this.UpdateContainerHelper();
 
       RaiseEvent( new RoutedPropertyChangedEventArgs<object>( oldValue, newValue, PropertyGrid.SelectedObjectChangedEvent ) );
     }
@@ -445,16 +512,17 @@ protected virtual void SelectedObjectNameChanged( string oldValue, string newVal
 
     #region SelectedPropertyItem
 
-    public static readonly DependencyProperty SelectedPropertyItemProperty = DependencyProperty.Register( "SelectedPropertyItem", typeof( PropertyItem ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
-    public PropertyItem SelectedPropertyItem
+    private static readonly DependencyPropertyKey SelectedPropertyItemPropertyKey = DependencyProperty.RegisterReadOnly( "SelectedPropertyItem", typeof( PropertyItemBase ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyItemChanged ) );
+    public static readonly DependencyProperty SelectedPropertyItemProperty = SelectedPropertyItemPropertyKey.DependencyProperty;
+    public PropertyItemBase SelectedPropertyItem
     {
       get
       {
-        return ( PropertyItem )GetValue( SelectedPropertyItemProperty );
+        return ( PropertyItemBase )GetValue( SelectedPropertyItemProperty );
       }
       internal set
       {
-        SetValue( SelectedPropertyItemProperty, value );
+        SetValue( SelectedPropertyItemPropertyKey, value );
       }
     }
 
@@ -462,10 +530,10 @@ private static void OnSelectedPropertyItemChanged( DependencyObject o, Dependenc
     {
       PropertyGrid propertyGrid = o as PropertyGrid;
       if( propertyGrid != null )
-        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItem )e.OldValue, ( PropertyItem )e.NewValue );
+        propertyGrid.OnSelectedPropertyItemChanged( ( PropertyItemBase )e.OldValue, ( PropertyItemBase )e.NewValue );
     }
 
-    protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, PropertyItem newValue )
+    protected virtual void OnSelectedPropertyItemChanged( PropertyItemBase oldValue, PropertyItemBase newValue )
     {
       if( oldValue != null )
         oldValue.IsSelected = false;
@@ -473,11 +541,53 @@ protected virtual void OnSelectedPropertyItemChanged( PropertyItem oldValue, Pro
       if( newValue != null )
         newValue.IsSelected = true;
 
-      RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItem>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
+      this.SelectedProperty = ( newValue != null ) ? _containerHelper.ItemFromContainer( newValue ) : null;
+
+      RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItemBase>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
     }
 
     #endregion //SelectedPropertyItem
 
+    #region SelectedProperty
+
+    /// <summary>
+    /// Identifies the SelectedProperty dependency property
+    /// </summary>
+    public static readonly DependencyProperty SelectedPropertyProperty =
+        DependencyProperty.Register( "SelectedProperty", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyChanged ) );
+
+    /// <summary>
+    /// Gets or sets the selected property or returns null if the selection is empty.
+    /// </summary>
+    public object SelectedProperty
+    {
+      get { return ( object )GetValue( SelectedPropertyProperty ); }
+      set { SetValue( SelectedPropertyProperty, value ); }
+    }
+
+    private static void OnSelectedPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
+    {
+      PropertyGrid propertyGrid = sender as PropertyGrid;
+      if( propertyGrid != null )
+      {
+        propertyGrid.OnSelectedPropertyChanged( ( object )args.OldValue, ( object )args.NewValue );
+      }
+    }
+
+    private void OnSelectedPropertyChanged( object oldValue, object newValue )
+    {
+      // Do not update the SelectedPropertyItem if the Current SelectedPropertyItem
+      // item is the same as the new SelectedProperty. There may be 
+      // duplicate items and the result could be to change the selection to the wrong item.
+      object currentSelectedProperty = _containerHelper.ItemFromContainer( this.SelectedPropertyItem );
+      if( !object.Equals( currentSelectedProperty, newValue ) )
+      {
+        this.SelectedPropertyItem = _containerHelper.ContainerFromItem( newValue );
+      }
+    }
+
+    #endregion //SelectedProperty
+
     #region ShowAdvancedOptions
 
     public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
@@ -557,12 +667,15 @@ static PropertyGrid()
 
     public PropertyGrid()
     {
-      _properties = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
+      _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
+      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);
+      UpdateContainerHelper();
       EditorDefinitions = new EditorDefinitionCollection();
       PropertyDefinitions = new PropertyDefinitionCollection();
 
-      AddHandler( PropertyItem.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
-      AddHandler( PropertyItem.ItemOrderingChangedEvent, new RoutedEventHandler( OnItemOrderingChanged ) );
+      AddHandler( PropertyItemBase.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
+      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
+      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
       CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
     }
 
@@ -581,6 +694,8 @@ public override void OnApplyTemplate()
       if( _dragThumb != null )
         _dragThumb.DragDelta += DragThumb_DragDelta;
 
+      _containerHelper.ChildrenItemsControl = GetTemplateChild( PART_PropertyItemsControl ) as PropertyItemsControl;
+
       //Update TranslateTransform in code-behind instead of XAML to remove the
       //output window error.
       //When we use FindAncesstor in custom control template for binding internal elements property 
@@ -609,13 +724,25 @@ protected override void OnPreviewKeyDown( KeyEventArgs e )
       }
     }
 
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+
+      // First check that the raised property is actually a real CLR property.
+      // This could be something else like a Attached DP.
+      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) )
+      {
+        this.Notify( this.PropertyChanged, e.Property.Name );
+      }
+    }
+
     #endregion //Base Class Overrides
 
     #region Event Handlers
 
     private void OnItemSelectionChanged( object sender, RoutedEventArgs args )
     {
-      PropertyItem item = ( PropertyItem )args.OriginalSource;
+      PropertyItemBase item = ( PropertyItemBase )args.OriginalSource;
       if( item.IsSelected )
       {
         SelectedPropertyItem = item;
@@ -629,9 +756,15 @@ private void OnItemSelectionChanged( object sender, RoutedEventArgs args )
       }
     }
 
-    private void OnItemOrderingChanged( object sender, RoutedEventArgs args )
+    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
     {
-      Properties.RefreshView();
+      _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
+      args.Handled = true;
+    }
+
+    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
       args.Handled = true;
     }
 
@@ -658,95 +791,41 @@ private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
 
     #region Methods
 
-    private void UpdateProperties( bool regenerateItems )
-    {
-      IEnumerable<PropertyItem> newProperties = null;
-      string defaultPropertyName = null;
-
-      if( regenerateItems )
-      {
-        newProperties = GeneratePropertyItems();
-        defaultPropertyName = GetDefaultPropertyName();
-
-        this.SelectedPropertyItem = ( defaultPropertyName != null )
-                                    ? newProperties.FirstOrDefault( ( prop ) => defaultPropertyName.Equals( prop.PropertyName ) )
-                                    : null;
-    }
-
-      Properties.Update( newProperties, IsCategorized, Filter );
-    }
-
-    private List<PropertyItem> GeneratePropertyItems()
-    {
-        return GeneratePropertyItems( SelectedObject );
-    }
-
-    private string GetDefaultPropertyName()
+    private void UpdateContainerHelper()
     {
-        return GetDefaultPropertyName( SelectedObject );
-    }
-
-    private List<PropertyItem> GeneratePropertyItems(object instance)
-    {
-      var propertyItems = new List<PropertyItem>();
-
-      if( instance != null )
+      // Keep a backup of the template element and initialize the
+      // new helper with it.
+      ItemsControl childrenItemsControl = null;
+      if( _containerHelper != null )
       {
-        try
+        childrenItemsControl = _containerHelper.ChildrenItemsControl;
+        _containerHelper.ClearHelper();
+        if( _containerHelper is ObjectContainerHelperBase )
         {
-          PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( instance );
-
-          if( !AutoGenerateProperties )
+          // If the actual AdvancedOptionMenu is the default menu for selected object, 
+          // remove it. Otherwise, it is a custom menu provided by the user.
+          // This "default" menu is only valid for the SelectedObject[s] case. Otherwise, 
+          // it is useless and we must remove it.
+          var defaultAdvancedMenu = ( ContextMenu )this.FindResource( PropertyGrid.SelectedObjectAdvancedOptionsMenuKey );
+          if( this.AdvancedOptionsMenu == defaultAdvancedMenu )
           {
-            List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
-            if( PropertyDefinitions != null )
-            {
-              foreach( PropertyDefinition pd in PropertyDefinitions )
-              {
-                foreach( PropertyDescriptor descriptor in descriptors )
-                {
-                  if( descriptor.Name == pd.Name )
-                  {
-                    specificProperties.Add( descriptor );
-                    break;
-                  }
-                }
-              }
-            }
-
-            descriptors = new PropertyDescriptorCollection( specificProperties.ToArray() );
-          }
-
-          foreach( PropertyDescriptor descriptor in descriptors )
-          {
-            if( descriptor.IsBrowsable )
-            {
-              propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, this ) );
-            }
+            this.AdvancedOptionsMenu = null;
           }
         }
-        catch( Exception )
-        {
-          //TODO: handle this some how
-        }
       }
 
-      return propertyItems;
-    }
-
-    private string GetDefaultPropertyName( object selectedObject )
-    {
-      return PropertyGridUtilities.GetDefaultPropertyName( selectedObject );
-    }
-
-
-
-
 
 
 
+      _containerHelper = new ObjectContainerHelper( this, SelectedObject );
+      ( ( ObjectContainerHelper )_containerHelper ).GenerateProperties();
 
 
+      _containerHelper.ChildrenItemsControl = childrenItemsControl;
+      // Since the template will bind on this property and this property
+      // will be different when the property parent is updated.
+      this.Notify( this.PropertyChanged, () => this.Properties );
+    }
 
 
 
@@ -763,28 +842,45 @@ private void UpdateThumb()
     {
       if( _dragThumb != null )
       {
-        if( IsCategorized )
-          _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
-        else
-          _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+      if( IsCategorized )
+        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+      else
+        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
       }
     }
 
+    /// <summary>
+    /// Override this call to control the filter applied based on the
+    /// text input.
+    /// </summary>
+    /// <param name="filter"></param>
+    /// <returns></returns>
+    protected virtual Predicate<object> CreateFilter( string filter )
+    {
+      return null;
+    }
+
     /// <summary>
     /// Updates all property values in the PropertyGrid with the data from the SelectedObject
     /// </summary>
     public void Update()
     {
-      foreach( var item in Properties )
-      {
-        BindingOperations.GetBindingExpressionBase( item, PropertyItem.ValueProperty ).UpdateTarget();
-      }
+      _containerHelper.UpdateValuesFromSource();
     }
 
+
+
     #endregion //Methods
 
     #region Events
 
+    #region PropertyChanged Event
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    #endregion
+
+    #region PropertyValueChangedEvent Routed Event
     public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
     public event PropertyValueChangedEventHandler PropertyValueChanged
     {
@@ -797,9 +893,12 @@ public event PropertyValueChangedEventHandler PropertyValueChanged
         RemoveHandler( PropertyValueChangedEvent, value );
       }
     }
+    #endregion
+
+    #region SelectedPropertyItemChangedEvent Routed Event
 
-    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItem> ), typeof( PropertyGrid ) );
-    public event RoutedPropertyChangedEventHandler<PropertyItem> SelectedPropertyItemChanged
+    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<PropertyItemBase> ), typeof( PropertyGrid ) );
+    public event RoutedPropertyChangedEventHandler<PropertyItemBase> SelectedPropertyItemChanged
     {
       add
       {
@@ -810,6 +909,9 @@ public event RoutedPropertyChangedEventHandler<PropertyItem> SelectedPropertyIte
         RemoveHandler( SelectedPropertyItemChangedEvent, value );
       }
     }
+    #endregion
+
+    #region SelectedObjectChangedEventRouted Routed Event
 
     public static readonly RoutedEvent SelectedObjectChangedEvent = EventManager.RegisterRoutedEvent( "SelectedObjectChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( PropertyGrid ) );
     public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
@@ -824,6 +926,111 @@ public event RoutedPropertyChangedEventHandler<object> SelectedObjectChanged
       }
     }
 
+    #endregion
+
+    #region PreparePropertyItemEvent Attached Routed Event
+
+    /// <summary>
+    /// Identifies the PreparePropertyItem event.
+    /// This attached routed event may be raised by the PropertyGrid itself or by a
+    /// PropertyItemBase containing sub-items.
+    /// </summary>
+    public static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
+
+    /// <summary>
+    /// This event is raised when a property item is about to be displayed in the PropertyGrid.
+    /// This allow the user to customize the property item just before it is displayed.
+    /// </summary>
+    public event PropertyItemEventHandler PreparePropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyGrid.PreparePropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyGrid.PreparePropertyItemEvent, value );
+      }
+    }
+
+    /// <summary>
+    /// Adds a handler for the PreparePropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void AddPreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.AddHandler( PropertyGrid.PreparePropertyItemEvent, handler );
+    }
+
+    /// <summary>
+    /// Removes a handler for the PreparePropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void RemovePreparePropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.RemoveHandler( PropertyGrid.PreparePropertyItemEvent, handler );
+    }
+
+    internal static void RaisePreparePropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
+    {
+      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.PreparePropertyItemEvent, source, propertyItem, item ) );
+    }
+
+    #endregion
+
+    #region ClearPropertyItemEvent Attached Routed Event
+
+    /// <summary>
+    /// Identifies the ClearPropertyItem event.
+    /// This attached routed event may be raised by the PropertyGrid itself or by a
+    /// PropertyItemBase containing sub items.
+    /// </summary>
+    public static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyGrid ) );
+    /// <summary>
+    /// This event is raised when an property item is about to be remove from the display in the PropertyGrid
+    /// This allow the user to remove any attached handler in the PreparePropertyItem event.
+    /// </summary>
+    public event PropertyItemEventHandler ClearPropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyGrid.ClearPropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyGrid.ClearPropertyItemEvent, value );
+      }
+    }
+
+    /// <summary>
+    /// Adds a handler for the ClearPropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void AddClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.AddHandler( PropertyGrid.ClearPropertyItemEvent, handler );
+    }
+
+    /// <summary>
+    /// Removes a handler for the ClearPropertyItem attached event
+    /// </summary>
+    /// <param name="element">the element to attach the handler</param>
+    /// <param name="handler">the handler for the event</param>
+    public static void RemoveClearPropertyItemHandler( UIElement element, PropertyItemEventHandler handler )
+    {
+      element.RemoveHandler( PropertyGrid.ClearPropertyItemEvent, handler );
+    }
+
+    internal static void RaiseClearPropertyItemEvent( UIElement source, PropertyItemBase propertyItem, object item )
+    {
+      source.RaiseEvent( new PropertyItemEventArgs( PropertyGrid.ClearPropertyItemEvent, source, propertyItem, item ) );
+    }
+
+    #endregion
+
     #endregion //Events
 
     #region Interfaces
@@ -841,44 +1048,48 @@ public override void EndInit()
       base.EndInit();
       if( --_initializationCount == 0 )
       {
-        ProcessInitializationParameters();
-      }
-    }
-
-    private void ProcessInitializationParameters()
-    {
-      if( _hasPendingSelectedObjectChanged )
-      {
-        //This will update SelectedObject, Type, Name based on the actual config.
-        this.UpdateProperties( true );
-        _hasPendingSelectedObjectChanged = false;
+        if( _hasPendingSelectedObjectChanged )
+        {
+          //This will update SelectedObject, Type, Name based on the actual config.
+          this.UpdateContainerHelper();
+          _hasPendingSelectedObjectChanged = false;
+        }
+        _containerHelper.OnEndInit();
       }
     }
 
     #endregion
 
-    #region IPropertyParent Members
+    #region IPropertyContainer Members
 
-    object IPropertyParent.ValueInstance
+    FilterInfo IPropertyContainer.FilterInfo
     {
-      get { return this.SelectedObject; }
+      get 
+      {
+        return new FilterInfo()
+        {
+          Predicate = this.CreateFilter(this.Filter),
+          InputString = this.Filter
+        };
+      }
     }
 
-    EditorDefinitionCollection IPropertyParent.EditorDefinitions
+    ContainerHelperBase IPropertyContainer.ContainerHelper
     {
-      get { return this.EditorDefinitions; }
+      get
+      {
+        return _containerHelper;
+      }
     }
 
-
     #endregion
 
 
-
-
-
     #endregion
+
   }
 
+  #region PropertyValueChangedEvent Handler/Args
   public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
   public class PropertyValueChangedEventArgs : RoutedEventArgs
   {
@@ -900,4 +1111,31 @@ public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, ob
       OldValue = oldValue;
     }
   }
+  #endregion
+
+  #region PropertyItemCreatedEvent Handler/Args
+  public delegate void PropertyItemEventHandler( object sender, PropertyItemEventArgs e );
+  public class PropertyItemEventArgs : RoutedEventArgs
+  {
+    public PropertyItemBase PropertyItem
+    {
+      get;
+      private set;
+    }
+
+    public object Item
+    {
+      get;
+      private set;
+    }
+
+    public PropertyItemEventArgs( RoutedEvent routedEvent, object source, PropertyItemBase propertyItem, object item )
+      : base( routedEvent, source )
+    {
+      this.PropertyItem = propertyItem;
+      this.Item = item;
+    }
+  }
+  #endregion
+
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
index 44cc924b1..caada6c45 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -27,136 +27,132 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Linq.Expressions;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
 using System.Windows.Controls;
+using System.Reflection;
+using System.Windows.Controls.Primitives;
+using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
+using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   internal class PropertyGridUtilities
   {
-    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
+    #region DefaultNoBorderControlStyle Static Property
+    private static Style _noBorderControlStyle;
+    internal static Style NoBorderControlStyle
     {
-      return property.Attributes.OfType<T>().FirstOrDefault();
-    }
-
-
-
-
-
-
-
-
+      get
+      {
+        if( _noBorderControlStyle == null )
+        {
+          var style = new Style( typeof( Control ) );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add(
+            new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          style.Triggers.Add( trigger );
+
+          _noBorderControlStyle = style;
+        }
 
-    internal static string GetDefaultPropertyName( object instance )
-    {
-      AttributeCollection attributes = TypeDescriptor.GetAttributes( instance );
-      DefaultPropertyAttribute defaultPropertyAttribute =( DefaultPropertyAttribute )attributes[ typeof( DefaultPropertyAttribute ) ];
-      return defaultPropertyAttribute != null ? defaultPropertyAttribute.Name : null;
+        return _noBorderControlStyle;
+      }
     }
+    #endregion
 
-    internal static PropertyDescriptorCollection GetPropertyDescriptors( object instance )
+    #region PropertyGridComboBoxStyle Static Property
+    private static Style _propertyGridComboBoxStyle;
+    internal static Style ComboBoxStyle
     {
-      PropertyDescriptorCollection descriptors;
-
-      TypeConverter tc = TypeDescriptor.GetConverter( instance );
-      if( tc == null || !tc.GetPropertiesSupported() )
+      get
       {
-        if( instance is ICustomTypeDescriptor )
-          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
-        else
-          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
-      }
-      else
-      {
-        descriptors = tc.GetProperties( instance );
+        if( _propertyGridComboBoxStyle == null )
+        {
+          var style = new Style( typeof( Control ) );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( Control.BackgroundProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          style.Triggers.Add( trigger );
+
+          _propertyGridComboBoxStyle = style;
+        }
+        return _propertyGridComboBoxStyle;
       }
-
-      return descriptors;
     }
+    #endregion
 
-
-
-
-
-
-
-
-
-    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, IPropertyParent propertyParent )
+    #region ColorPickerStyle Static Property
+    private static Style _colorPickerStyle;
+    internal static Style ColorPickerStyle
     {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, propertyParent );
-      definition.InitProperties();
-      PropertyItem propertyItem = new PropertyItem();
-      propertyItem.PropertyDescriptor = property;
-      propertyItem.Instance = propertyParent.ValueInstance;
-      PropertyGridUtilities.InitializePropertyItem( propertyItem, definition );
-      return propertyItem;
-    }
-
-    internal static PropertyItem CreatePropertyItem( IPropertyDefinition pd )
-    {
-      PropertyItem propertyItem = new PropertyItem();
+      get
+      {
+        if( _colorPickerStyle == null )
+        {
+          Style defaultColorPickerStyle = Application.Current.TryFindResource( typeof( ColorPicker ) ) as Style;
+          var style = new Style( typeof( ColorPicker ), defaultColorPickerStyle );
+          var trigger = new MultiTrigger();
+          trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+          trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+          trigger.Setters.Add( new Setter( ColorPicker.ShowDropDownButtonProperty, false ) );
+          style.Triggers.Add( trigger );
+
+          _colorPickerStyle = style;
+        }
 
-      var descriptorBase = pd as DescriptorPropertyDefinitionBase;
-      propertyItem.PropertyDescriptor = ( descriptorBase != null ) ? descriptorBase.GetPropertyDescriptor() : null;
-      propertyItem.Instance = ( descriptorBase != null ) ? descriptorBase.PropertyParent.ValueInstance : null;
-      PropertyGridUtilities.InitializePropertyItem( propertyItem, pd );
-      return propertyItem;
+        return _colorPickerStyle;
+      }
     }
+    #endregion
 
-    private static void InitializePropertyItem( PropertyItem propertyItem, IPropertyDefinition pd )
+    #region UpDownBaseStyle Static Getter
+    private static Dictionary<Type, Style> _upDownStyles;
+    internal static Style GetUpDownBaseStyle<T>()
     {
-      propertyItem.ChildrenDefinitions = pd.ChildrenDefinitions;
-
-
-      // Assign a shorter name, for code clarity only.
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.DisplayNameProperty, pd, () => pd.DisplayName );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.DescriptionProperty, pd, () => pd.Description );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.CategoryProperty, pd, () => pd.Category );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.PropertyOrderProperty, pd, () => pd.DisplayOrder );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.AdvancedOptionsIconProperty, pd, () => pd.AdvancedOptionsIcon );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.AdvancedOptionsTooltipProperty, pd, () => pd.AdvancedOptionsTooltip );
-      PropertyGridUtilities.SetupDefinitionBinding( propertyItem, PropertyItem.IsExpandableProperty, pd, () => pd.IsExpandable );
-
-      Binding valueBinding = new Binding( "Value" )
+      if( _upDownStyles == null )
       {
-        Source = pd,
-        Mode = BindingMode.TwoWay
-      };
-      propertyItem.SetBinding( PropertyItem.ValueProperty, valueBinding );
-
-      propertyItem.Editor = pd.GenerateEditorElement( propertyItem );
+        _upDownStyles = new Dictionary<Type, Style>();
+      }
 
-      if( pd.CommandBindings != null )
+      Style style;
+      if( !_upDownStyles.TryGetValue( typeof( T ), out style ) )
       {
-        foreach( CommandBinding commandBinding in pd.CommandBindings )
-        {
-          propertyItem.CommandBindings.Add( commandBinding );
-        }
+        style = new Style( typeof( UpDownBase<T> ) );
+        var trigger = new MultiTrigger();
+        trigger.Conditions.Add( new Condition( Control.IsKeyboardFocusWithinProperty, false ) );
+        trigger.Conditions.Add( new Condition( Control.IsMouseOverProperty, false ) );
+        trigger.Setters.Add(
+          new Setter( Control.BorderBrushProperty, new SolidColorBrush( Colors.Transparent ) ) );
+        trigger.Setters.Add(
+          new Setter( UpDownBase<T>.ShowButtonSpinnerProperty, false ) );
+        style.Triggers.Add( trigger );
+
+        _upDownStyles.Add( typeof( T ), style );
       }
+      return style;
     }
+    #endregion
 
-    private static void SetupDefinitionBinding<T>( 
-      PropertyItem propertyItem, 
-      DependencyProperty itemProperty, 
-      IPropertyDefinition pd,
-      Expression<Func<T>> definitionProperty )
+    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
     {
-      string sourceProperty = ReflectionHelper.GetPropertyOrFieldName( definitionProperty );
-      Binding binding = new Binding( sourceProperty )
-      {
-        Source = pd,
-        Mode = BindingMode.OneWay
-      };
-
-      propertyItem.SetBinding( itemProperty, binding );
+      return property.Attributes.OfType<T>().FirstOrDefault();
     }
 
+
+
+
     internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverter typeConverter )
     {
       ITypeEditor editor = null;
 
-      if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
+      if( propertyType == typeof( string )  )
+        editor = new TextBoxEditor();
+      else if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
         editor = new CheckBoxEditor();
       else if( propertyType == typeof( decimal ) || propertyType == typeof( decimal? ) )
         editor = new DecimalUpDownEditor();
@@ -197,7 +193,7 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte
         editor = new TextBoxEditor();
       else
       {
-        Type listType = CollectionControl.GetListItemType( propertyType );
+        Type listType = ListUtilities.GetListItemType( propertyType );
 
         if( listType != null )
         {
@@ -219,5 +215,18 @@ internal static ITypeEditor CreateDefaultEditor( Type propertyType, TypeConverte
 
       return editor;
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
index 4fb249744..4d9979891 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
@@ -24,258 +24,69 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Data;
-using Xceed.Wpf.Toolkit.PropertyGrid.Implementation;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Linq.Expressions;
+using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  public class PropertyItem : Control
+  [TemplatePart( Name = "content", Type = typeof( ContentControl ) )]
+  public class PropertyItem : CustomPropertyItem
   {
-    #region Properties
-
-    #region AdvancedOptionsIcon
-
-    public static readonly DependencyProperty AdvancedOptionsIconProperty =
-        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public ImageSource AdvancedOptionsIcon
-    {
-      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
-      set { SetValue( AdvancedOptionsIconProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsIcon
-
-    #region AdvancedOptionsTooltip
-
-    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
-        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public object AdvancedOptionsTooltip
-    {
-      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
-      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
-    }
-
-    #endregion //AdvancedOptionsTooltip
-
-    #region Category
+    private int _categoryOrder;
 
-    public static readonly DependencyProperty CategoryProperty =
-        DependencyProperty.Register( "Category", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string Category
-    {
-      get { return ( string )GetValue( CategoryProperty ); }
-      set { SetValue( CategoryProperty, value ); }
-    }
-
-    #endregion //Category
+    #region Properties
 
     #region CategoryOrder
 
     public int CategoryOrder
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //CategoryOrder
-
-    #region ChildrenDefinitions
-
-    internal IEnumerable<IPropertyDefinition> ChildrenDefinitions
-    {
-      get;
-      set;
-    }
-
-    #endregion
-
-    #region Description
-
-    public static readonly DependencyProperty DescriptionProperty =
-        DependencyProperty.Register( "Description", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string Description
-    {
-      get { return ( string )GetValue( DescriptionProperty ); }
-      set { SetValue( DescriptionProperty, value ); }
-    }
-
-    #endregion //Description
-
-    #region DisplayName
-
-    public static readonly DependencyProperty DisplayNameProperty =
-        DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
-
-    public string DisplayName
-    {
-      get { return ( string )GetValue( DisplayNameProperty ); }
-      set { SetValue( DisplayNameProperty, value ); }
-    }
-
-    #endregion //DisplayName
-
-    #region Editor
-
-    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnEditorChanged ) );
-    public FrameworkElement Editor
-    {
-      get
-      {
-        return ( FrameworkElement )GetValue( EditorProperty );
-      }
-      set
-      {
-        SetValue( EditorProperty, value );
-      }
-    }
-
-    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
-    }
-
-    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
-    {
-      if( oldValue != null )
-        oldValue.DataContext = null;
-
-      if( newValue != null )
-        newValue.DataContext = this;
-    }
-
-    #endregion //Editor
-
-    #region Instance
-
-    public object Instance
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Instance
-
-    #region IsExpanded
-
-    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
-    public bool IsExpanded
     {
       get
       {
-        return ( bool )GetValue( IsExpandedProperty );
+        return _categoryOrder;
       }
-      set
+      internal set
       {
-        SetValue( IsExpandedProperty, value );
-      }
-    }
-
-    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
-    {
-      if( newValue && Properties.Count == 0 && ( this.ChildrenDefinitions != null ) )
-      {
-        IEnumerable<PropertyItem> children = this.ChildrenDefinitions
-          .Select( 
-          ( def ) => 
-            {
-              PropertyItem subProperty = PropertyGridUtilities.CreatePropertyItem( def );
-              subProperty.Level = Level + 1;
-              return subProperty;
-            });
-
-        Properties.Update( children, false, null );
+        if( _categoryOrder != value )
+        {
+          _categoryOrder = value;
+          // Notify the parent helper since this property may affect ordering.
+          this.RaisePropertyChanged( () => this.CategoryOrder );
+        }
       }
     }
 
-    #endregion IsExpanded
-
-    #region IsExpandable
-
-    public static readonly DependencyProperty IsExpandableProperty =
-        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
-
-    public bool IsExpandable
-    {
-      get { return ( bool )GetValue( IsExpandableProperty ); }
-      set { SetValue( IsExpandableProperty, value ); }
-    }
-
-    #endregion //IsExpandable
+    #endregion //CategoryOrder
 
     #region IsReadOnly
 
-    public bool IsReadOnly
-    {
-      get
-      {
-        return ( PropertyDescriptor != null )
-        ? PropertyDescriptor.IsReadOnly
-        : false;
-      }
-    }
-
-    #endregion
-
-    #region IsSelected
+    /// <summary>
+    /// Identifies the IsReadOnly dependency property
+    /// </summary>
+    public static readonly DependencyProperty IsReadOnlyProperty =
+        DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
 
-    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
-    public bool IsSelected
-    {
-      get
-      {
-        return ( bool )GetValue( IsSelectedProperty );
-      }
-      set
-      {
-        SetValue( IsSelectedProperty, value );
-      }
-    }
-
-    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
-    {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
-    }
-
-    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    public bool IsReadOnly
     {
-      this.RaiseItemSelectionChangedEvent();
+      get { return ( bool )GetValue( IsReadOnlyProperty ); }
+      set { SetValue( IsReadOnlyProperty, value ); }
     }
 
-    #endregion //IsSelected
-
-    #region Level
+    #endregion //IsReadOnly
 
-    public int Level
-    {
-      get;
-      internal set;
-    }
-
-    #endregion //Level
+    #region PropertyOrder
 
-    #region Properties
+    public static readonly DependencyProperty PropertyOrderProperty =
+        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
 
-    public PropertyItemCollection Properties
+    public int PropertyOrder
     {
-      get;
-      private set;
+      get { return ( int )GetValue( PropertyOrderProperty ); }
+      set { SetValue( PropertyOrderProperty, value ); }
     }
 
-    #endregion //Properties
+    #endregion //PropertyOrder
 
     #region PropertyDescriptor
 
@@ -287,74 +98,71 @@ public PropertyDescriptor PropertyDescriptor
 
     #endregion //PropertyDescriptor
 
-    #region PropertyName
+    #region PropertyType
 
-    internal string PropertyName
+    public Type PropertyType
     {
       get
       {
-        PropertyDescriptor descriptor = this.PropertyDescriptor;
-        return ( descriptor != null ) ? descriptor.Name : null;
+        return ( PropertyDescriptor != null )
+          ? PropertyDescriptor.PropertyType
+          : null;
       }
     }
 
-    #endregion //PropertyDescriptor
+    #endregion //PropertyType
 
-    #region PropertyOrder
+    #region DescriptorDefinition
 
-    public static readonly DependencyProperty PropertyOrderProperty =
-        DependencyProperty.Register( "PropertyOrder", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
-
-    public int PropertyOrder
+    internal DescriptorPropertyDefinitionBase DescriptorDefinition
     {
-      get { return ( int )GetValue( PropertyOrderProperty ); }
-      set { SetValue( PropertyOrderProperty, value ); }
+      get;
+      private set;
     }
 
-    #endregion //PropertyOrder
+    #endregion DescriptorDefinition
 
-    #region PropertyType
+    #region Instance
 
-    public Type PropertyType
+    public object Instance
     {
-      get
-      {
-        return ( PropertyDescriptor != null )
-          ? PropertyDescriptor.PropertyType
-          : null;
-      }
+      get;
+      internal set;
     }
 
-    #endregion //PropertyType
+    #endregion //Instance
 
-    #region Value
+    #endregion //Properties
 
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnValueChanged, OnCoerceValueChanged ) );
-    public object Value
+    #region Methods
+
+    protected override void OnIsExpandedChanged( bool oldValue, bool newValue )
     {
-      get
+      if( newValue )
       {
-        return ( object )GetValue( ValueProperty );
-      }
-      set
-      {
-        SetValue( ValueProperty, value );
+        // This withholds the generation of all PropertyItem instances (recursively)
+        // until the PropertyItem is expanded.
+        var objectContainerHelper = ContainerHelper as ObjectContainerHelperBase;
+        if( objectContainerHelper != null )
+        {
+          objectContainerHelper.GenerateProperties();
+        }
       }
     }
 
-    private static object OnCoerceValueChanged( DependencyObject o, object baseValue )
+    protected override void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
     {
-      PropertyItem prop = o as PropertyItem;
-      if( prop != null )
-        return prop.OnCoerceValueChanged( baseValue );
+      if( oldValue != null )
+        oldValue.DataContext = null;
 
-      return baseValue;
+      if( newValue != null )
+        newValue.DataContext = this;
     }
 
-    protected virtual object OnCoerceValueChanged( object baseValue )
+    protected override object OnCoerceValueChanged( object baseValue )
     {
       // Propagate error from DescriptorPropertyDefinitionBase to PropertyItem.Value
-      // to see the red error rectangle in te propertyGrid.
+      // to see the red error rectangle in the propertyGrid.
       BindingExpression be = GetBindingExpression( PropertyItem.ValueProperty );
       if( ( be != null ) && be.DataItem is DescriptorPropertyDefinitionBase )
       {
@@ -368,102 +176,32 @@ protected virtual object OnCoerceValueChanged( object baseValue )
       return baseValue;
     }
 
-    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    protected override void OnValueChanged( object oldValue, object newValue )
     {
-      PropertyItem propertyItem = o as PropertyItem;
-      if( propertyItem != null )
-      {
-        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
-      }
-    }
+      base.OnValueChanged( oldValue, newValue );
 
-    protected virtual void OnValueChanged( object oldValue, object newValue )
-    {
-      if( IsInitialized )
+      // Update the ObjectContainerHelper this depends on 
+      var helper = new ObjectContainerHelper( this, newValue );
+      this.ContainerHelper = helper;
+      if( this.IsExpanded )
       {
-        RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+        helper.GenerateProperties();
       }
     }
 
-    #endregion //Value
-
-    #endregion //Properties
-
-    #region Events
-
-    #region ItemSelectionChanged
-
-    internal static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent(
-        "ItemSelectionChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItem ) );
-
-    private void RaiseItemSelectionChangedEvent()
-    {
-      RaiseEvent( new RoutedEventArgs( PropertyItem.ItemSelectionChangedEvent ) );
-    }
-
-    #endregion
-
-    #region ItemOrderingChanged
-
-    internal static readonly RoutedEvent ItemOrderingChangedEvent = EventManager.RegisterRoutedEvent(
-        "ItemOrderingChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItem ) );
-
-    private void RaiseItemOrderingChangedEvent()
-    {
-      RaiseEvent( new RoutedEventArgs( PropertyItem.ItemOrderingChangedEvent ) );
-    }
-
     #endregion
 
-    #endregion //Events
-
     #region Constructors
 
-    static PropertyItem()
+    internal PropertyItem( DescriptorPropertyDefinitionBase definition )
+      : base()
     {
-      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItem ), new FrameworkPropertyMetadata( typeof( PropertyItem ) ) );
-    }
+      if( definition == null )
+        throw new ArgumentNullException( "definition" );
 
-    internal PropertyItem()
-    {
-      Properties = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
-      AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( PropertyItem_PreviewMouseDown ), true );
-      AddHandler( PropertyItem.ItemOrderingChangedEvent, new RoutedEventHandler( OnItemOrderingChanged ), false );
+      this.DescriptorDefinition = definition;
     }
 
     #endregion //Constructors
-
-    #region Event Handlers
-
-    private void PropertyItem_PreviewMouseDown( object sender, MouseButtonEventArgs e )
-    {
-      IsSelected = true;
-    }
-
-    private void OnItemOrderingChanged( object sender, RoutedEventArgs args )
-    {
-      if( args.OriginalSource != this )
-      {
-        //If the OriginalSource is not ourself, it comes from one of our children.
-        Properties.RefreshView();
-        args.Handled = true;
-      }
-    }
-
-    #endregion  //Event Handlers
-
-    #region Methods
-
-    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
-    {
-      base.OnPropertyChanged( e );
-
-      if( PropertyItemCollection.IsItemOrderingProperty( e.Property.Name ) )
-      {
-        this.RaiseItemOrderingChangedEvent();
-      }
-    }
-
-    #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
new file mode 100644
index 000000000..914d3171a
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
@@ -0,0 +1,459 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Data;
+using System.Collections;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Reflection;
+using System.Linq.Expressions;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  [TemplatePart( Name = PropertyGrid.PART_PropertyItemsControl, Type = typeof( PropertyItemsControl ) )]
+  [TemplatePart( Name = PropertyItemBase.PART_ValueContainer, Type = typeof( ContentControl ) )]
+  public abstract class PropertyItemBase : Control, IPropertyContainer, INotifyPropertyChanged
+  {
+    internal const string PART_ValueContainer = "PART_ValueContainer";
+
+    private ContentControl _valueContainer;
+    private ContainerHelperBase _containerHelper;
+    private IPropertyContainer _parentNode;
+
+    #region Properties
+
+    #region AdvancedOptionsIcon
+
+    public static readonly DependencyProperty AdvancedOptionsIconProperty =
+        DependencyProperty.Register( "AdvancedOptionsIcon", typeof( ImageSource ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public ImageSource AdvancedOptionsIcon
+    {
+      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
+      set { SetValue( AdvancedOptionsIconProperty, value ); }
+    }
+
+    #endregion //AdvancedOptionsIcon
+
+    #region AdvancedOptionsTooltip
+
+    public static readonly DependencyProperty AdvancedOptionsTooltipProperty =
+        DependencyProperty.Register( "AdvancedOptionsTooltip", typeof( object ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public object AdvancedOptionsTooltip
+    {
+      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
+      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
+    }
+
+    #endregion //AdvancedOptionsTooltip
+
+
+
+
+
+
+    #region Description
+
+    public static readonly DependencyProperty DescriptionProperty =
+        DependencyProperty.Register( "Description", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public string Description
+    {
+      get { return ( string )GetValue( DescriptionProperty ); }
+      set { SetValue( DescriptionProperty, value ); }
+    }
+
+    #endregion //Description
+
+    #region DisplayName
+
+    public static readonly DependencyProperty DisplayNameProperty =
+        DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItemBase ), new UIPropertyMetadata( null ) );
+
+    public string DisplayName
+    {
+      get { return ( string )GetValue( DisplayNameProperty ); }
+      set { SetValue( DisplayNameProperty, value ); }
+    }
+
+    #endregion //DisplayName
+
+    #region Editor
+
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItemBase ), new UIPropertyMetadata( null, OnEditorChanged ) );
+    public FrameworkElement Editor
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( EditorProperty );
+      }
+      set
+      {
+        SetValue( EditorProperty, value );
+      }
+    }
+
+    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
+    }
+
+    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
+    {
+    }
+
+    #endregion //Editor
+
+    #region IsExpanded
+
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
+    public bool IsExpanded
+    {
+      get
+      {
+        return ( bool )GetValue( IsExpandedProperty );
+      }
+      set
+      {
+        SetValue( IsExpandedProperty, value );
+      }
+    }
+
+    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItemBase propertyItem = o as PropertyItemBase;
+      if( propertyItem != null )
+        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
+    {
+    }
+
+    #endregion IsExpanded
+
+    #region IsExpandable
+
+    public static readonly DependencyProperty IsExpandableProperty =
+        DependencyProperty.Register( "IsExpandable", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false ) );
+
+    public bool IsExpandable
+    {
+      get { return ( bool )GetValue( IsExpandableProperty ); }
+      set { SetValue( IsExpandableProperty, value ); }
+    }
+
+    #endregion //IsExpandable
+
+    #region IsSelected
+
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItemBase ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
+
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItemBase propertyItem = o as PropertyItemBase;
+      if( propertyItem != null )
+        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      this.RaiseItemSelectionChangedEvent();
+    }
+
+    #endregion //IsSelected
+
+    #region ParentElement
+    /// <summary>
+    /// Gets the parent property grid element of this property.
+    /// A PropertyItemBase instance if this is a sub-element, 
+    /// or the PropertyGrid itself if this is a first-level property.
+    /// </summary>
+    public FrameworkElement ParentElement
+    {
+      get { return this.ParentNode as FrameworkElement; }
+    }
+    #endregion
+
+    #region ParentNode
+
+    internal IPropertyContainer ParentNode
+    {
+      get
+      {
+        return _parentNode;
+      }
+      set
+      {
+        _parentNode = value;
+      }
+    }
+    #endregion
+
+    #region ValueContainer
+
+    internal ContentControl ValueContainer
+    {
+      get
+      {
+        return _valueContainer;
+      }
+    }
+
+    #endregion
+
+    #region Level
+
+    public int Level
+    {
+      get;
+      internal set;
+    }
+
+    #endregion //Level
+
+    #region Properties
+
+    public IList Properties
+    {
+      get
+      {
+        return _containerHelper.Properties;
+      }
+    }
+
+    #endregion //Properties
+
+    #region PropertyContainerStyle
+    /// <summary>
+    /// Get the PropertyContainerStyle for sub items of this property.
+    /// It return the value defined on PropertyGrid.PropertyContainerStyle.
+    /// </summary>
+    public Style PropertyContainerStyle 
+    {
+      get
+      {
+        return ( ParentNode != null )
+        ? ParentNode.PropertyContainerStyle
+        : null;
+      }
+    }
+    #endregion
+
+    #region ContainerHelper
+
+    internal ContainerHelperBase ContainerHelper
+    {
+      get
+      {
+        return _containerHelper;
+      }
+      set
+      {
+        if( value == null )
+          throw new ArgumentNullException( "value" );
+
+        _containerHelper = value;
+        // Properties property relies on the "Properties" property of the helper
+        // class. Raise a property-changed event.
+        this.RaisePropertyChanged( () => this.Properties );
+      }
+    }
+
+    #endregion
+
+    #endregion //Properties
+
+    #region Events
+
+    #region ItemSelectionChanged
+
+    internal static readonly RoutedEvent ItemSelectionChangedEvent = EventManager.RegisterRoutedEvent(
+        "ItemSelectionChangedEvent", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyItemBase ) );
+
+    private void RaiseItemSelectionChangedEvent()
+    {
+      RaiseEvent( new RoutedEventArgs( PropertyItemBase.ItemSelectionChangedEvent ) );
+    }
+
+    #endregion
+
+    #region PropertyChanged event
+
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    internal void RaisePropertyChanged<TMember>( Expression<Func<TMember>> propertyExpression )
+    {
+      this.Notify( this.PropertyChanged, propertyExpression );
+    }
+    internal void RaisePropertyChanged( string name )
+    {
+      this.Notify( this.PropertyChanged, name );
+    }
+    #endregion
+
+    #endregion //Events
+
+    #region Constructors
+
+    static PropertyItemBase()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItemBase ), new FrameworkPropertyMetadata( typeof( PropertyItemBase ) ) );
+    }
+
+    internal PropertyItemBase()
+    {
+      _containerHelper = new ObjectContainerHelper( this, null );
+      this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
+      AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
+      AddHandler( PropertyItemsControl.ClearPropertyItemEvent, new PropertyItemEventHandler( OnClearPropertyItemInternal ) );
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    private void OnPreparePropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
+      args.PropertyItem.Level = this.Level + 1;
+      _containerHelper.PrepareChildrenPropertyItem( args.PropertyItem, args.Item );
+
+      args.Handled = true;
+    }
+
+    private void OnClearPropertyItemInternal( object sender, PropertyItemEventArgs args )
+    {
+      _containerHelper.ClearChildrenPropertyItem( args.PropertyItem, args.Item );
+      // This is the callback of the PreparePropertyItem comming from the template PropertyItemControl.
+      args.PropertyItem.Level = 0;
+
+      args.Handled = true;
+    }
+
+    #endregion  //Event Handlers
+
+    #region Methods
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      _containerHelper.ChildrenItemsControl = GetTemplateChild( PropertyGrid.PART_PropertyItemsControl ) as PropertyItemsControl;
+      _valueContainer = GetTemplateChild( PropertyItemBase.PART_ValueContainer ) as ContentControl;
+    }
+
+    protected override void OnMouseDown( MouseButtonEventArgs e )
+    {
+      IsSelected = true;
+      if( !this.IsKeyboardFocusWithin )
+      {
+        this.Focus();
+      }
+      // Handle the event; otherwise, the possible 
+      // parent property item will select itself too.
+      e.Handled = true;
+    }
+
+    private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
+    { 
+      IsSelected = true;
+      // Handle the event; otherwise, the possible 
+      // parent property item will select itself too.
+      e.Handled = true;
+    }
+
+    protected override void OnPropertyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      base.OnPropertyChanged( e );
+
+      // First check that the raised property is actually a real CLR property.
+      // This could be something else like an Attached DP.
+      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) )
+      {
+        this.RaisePropertyChanged( e.Property.Name );
+      }
+    }
+
+    #endregion //Methods
+
+    #region IPropertyContainer Members
+
+
+
+    Style IPropertyContainer.PropertyContainerStyle
+    {
+      get { return this.PropertyContainerStyle; }
+    }
+
+    EditorDefinitionCollection IPropertyContainer.EditorDefinitions
+    {
+      get { return ParentNode.EditorDefinitions; }
+    }
+
+    PropertyDefinitionCollection IPropertyContainer.PropertyDefinitions
+    {
+      get { return null; }
+    }
+
+    ContainerHelperBase IPropertyContainer.ContainerHelper 
+    {
+      get
+      {
+        return this.ContainerHelper;
+      }
+    }
+
+    bool IPropertyContainer.IsCategorized 
+    {
+      get { return false; }
+    }
+
+    bool IPropertyContainer.AutoGenerateProperties
+    {
+      get { return true; }
+    }
+
+    FilterInfo IPropertyContainer.FilterInfo
+    {
+      get { return new FilterInfo(); }
+    }
+
+    #endregion
+
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
index bfdecf3b6..5855168f2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -30,10 +30,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   public class PropertyItemCollection : ReadOnlyObservableCollection<PropertyItem>
   {
-    private static readonly string CategoryPropertyName;
-    private static readonly string CategoryOrderPropertyName;
-    private static readonly string PropertyOrderPropertyName;
-    private static readonly string DisplayNamePropertyName;
+    internal static readonly string CategoryPropertyName;
+    internal static readonly string CategoryOrderPropertyName;
+    internal static readonly string PropertyOrderPropertyName;
+    internal static readonly string DisplayNamePropertyName;
 
     private bool _preventNotification;
 
@@ -52,6 +52,12 @@ public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollect
       EditableCollection = editableCollection;
     }
 
+    internal Predicate<object> FilterPredicate
+    {
+      get { return GetDefaultView().Filter; }
+      set { GetDefaultView().Filter = value; }
+    }
+
     public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
 
     private ICollectionView GetDefaultView()
@@ -71,14 +77,8 @@ public void SortBy( string name, ListSortDirection sortDirection )
 
     public void Filter( string text )
     {
-      if( text == null )
-        return;
-
-      GetDefaultView().Filter = ( item ) =>
-      {
-        var property = item as PropertyItem;
-        return property.DisplayName.ToLower().StartsWith( text.ToLower() );
-      };
+      Predicate<object> filter = PropertyItemCollection.CreateFilter( text );
+      GetDefaultView().Filter = filter;
     }
 
     protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs args )
@@ -89,42 +89,42 @@ protected override void OnCollectionChanged( NotifyCollectionChangedEventArgs ar
       base.OnCollectionChanged( args );
     }
 
-    internal void Update( IEnumerable<PropertyItem> newItems,  bool isCategorized, string filter )
+    internal void UpdateItems( IEnumerable<PropertyItem> newItems )
     {
+      if( newItems == null )
+        throw new ArgumentNullException( "newItems" );
+
+      _preventNotification = true;
       using( GetDefaultView().DeferRefresh() )
       {
-        _preventNotification = true;
-
-        // Replace the collection content with the new items.
-        if( newItems != null )
+        EditableCollection.Clear();
+        foreach( var item in newItems )
         {
-          EditableCollection.Clear();
-          foreach( var item in newItems )
-          {
-            this.EditableCollection.Add( item );
-          }
+          this.EditableCollection.Add( item );
         }
+      }
+      _preventNotification = false;
+      OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
+    }
 
-        // Clear view values
-        ICollectionView view = this.GetDefaultView();
+    internal void UpdateCategorization( GroupDescription groupDescription )
+    {
+      // Clear view values
+      ICollectionView view = this.GetDefaultView();
+      using( view.DeferRefresh() )
+      {
         view.GroupDescriptions.Clear();
         view.SortDescriptions.Clear();
-        view.Filter = null;
 
         // Update view values
-        if( isCategorized )
+        if( groupDescription != null )
         {
-          GroupBy( CategoryPropertyName );
+          view.GroupDescriptions.Add( groupDescription );
           SortBy( CategoryPropertyName, ListSortDirection.Ascending );
         }
 
         SortBy( PropertyOrderPropertyName, ListSortDirection.Ascending );
         SortBy( DisplayNamePropertyName, ListSortDirection.Ascending );
-
-        Filter( filter );
-
-        _preventNotification = false;
-        OnCollectionChanged( new NotifyCollectionChangedEventArgs( NotifyCollectionChangedAction.Reset ) );
       }
     }
 
@@ -133,12 +133,25 @@ internal void RefreshView()
       GetDefaultView().Refresh();
     }
 
-    internal static bool IsItemOrderingProperty( string propertyName )
+    internal static Predicate<object> CreateFilter( string text )
     {
-      return string.Equals( propertyName, DisplayNamePropertyName )
-        || string.Equals( propertyName, CategoryPropertyName )
-        || string.Equals( propertyName, CategoryOrderPropertyName )
-        || string.Equals( propertyName, PropertyOrderPropertyName );
+      Predicate<object> filter = null;
+
+      if( !string.IsNullOrEmpty( text ) )
+      {
+        filter = ( item ) =>
+        {
+          var property = item as PropertyItem;
+          if( property.DisplayName != null )
+          {
+            return property.DisplayName.ToLower().StartsWith( text.ToLower() );
+          }
+
+          return false;
+        };
+      }
+
+      return filter;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
new file mode 100644
index 000000000..588326a76
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
@@ -0,0 +1,96 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Controls;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// This Control is intended to be used in the template of the 
+  /// PropertyItemBase and PropertyGrid classes to contain the
+  /// sub-children properties.
+  /// </summary>
+  public class PropertyItemsControl : ItemsControl
+  {
+
+    #region PreparePropertyItemEvent Attached Routed Event
+
+    internal static readonly RoutedEvent PreparePropertyItemEvent = EventManager.RegisterRoutedEvent( "PreparePropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
+    internal event PropertyItemEventHandler PreparePropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyItemsControl.PreparePropertyItemEvent, value );
+      }
+    }
+
+    private void RaisePreparePropertyItemEvent( PropertyItemBase propertyItem, object item )
+    {
+      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.PreparePropertyItemEvent, this, propertyItem, item ) );
+    }
+
+    #endregion
+
+    #region ClearPropertyItemEvent Attached Routed Event
+
+    internal static readonly RoutedEvent ClearPropertyItemEvent = EventManager.RegisterRoutedEvent( "ClearPropertyItem", RoutingStrategy.Bubble, typeof( PropertyItemEventHandler ), typeof( PropertyItemsControl ) );
+    internal event PropertyItemEventHandler ClearPropertyItem
+    {
+      add
+      {
+        AddHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyItemsControl.ClearPropertyItemEvent, value );
+      }
+    }
+
+    private void RaiseClearPropertyItemEvent( PropertyItemBase propertyItem, object item )
+    {
+      this.RaiseEvent( new PropertyItemEventArgs( PropertyItemsControl.ClearPropertyItemEvent, this, propertyItem, item ) );
+    }
+
+    #endregion
+
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return ( item is PropertyItemBase );
+    }
+
+
+    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
+    {
+      base.PrepareContainerForItemOverride( element, item );
+      this.RaisePreparePropertyItemEvent( ( PropertyItemBase )element, item );
+    }
+
+    protected override void ClearContainerForItemOverride( DependencyObject element, object item )
+    {
+      this.RaiseClearPropertyItemEvent( ( PropertyItemBase )element, item );
+      base.ClearContainerForItemOverride( element, item );
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
new file mode 100644
index 000000000..d1445c040
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
@@ -0,0 +1,59 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+
+namespace Xceed.Wpf.Toolkit.PropertyGrid
+{
+  /// <summary>
+  /// This class is intended to provide the "Type" target
+  /// for property definitions or editor definitions when
+  /// using Property Element Syntax.
+  /// </summary>
+  public sealed class TargetPropertyType
+  {
+    private Type _type;
+    private bool _sealed;
+
+    public Type Type
+    {
+      get { return _type; }
+      set 
+      {
+        if( _sealed )
+          throw new InvalidOperationException(
+            string.Format(
+            "{0}.Type property cannot be modified once the instance is used",
+            typeof( TargetPropertyType ) ) );
+
+        _type = value; 
+      }
+    }
+
+    internal void Seal()
+    {
+      if( _type == null )
+        throw new InvalidOperationException(
+          string.Format( "{0}.Type property must be initialized", typeof( TargetPropertyType ) ) );
+
+      _sealed = true;
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..c950c4ed4
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,512 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:pg="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:pgconv="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Converters"
+                    xmlns:utilities="clr-namespace:Xceed.Wpf.Toolkit.Core.Utilities"
+                    xmlns:commands="clr-namespace:Xceed.Wpf.Toolkit.PropertyGrid.Commands"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <!-- =============================================================================== -->
+    <!-- PropertyGrid                                                                    -->
+    <!-- =============================================================================== -->
+
+    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <pgconv:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+
+    <x:Static x:Key="EmptyString" Member="sys:String.Empty" />
+
+    <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Height" Value="22" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+        <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+        <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type RadioButton}">
+                    <Grid SnapsToDevicePixels="True">
+                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="0" />
+                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0">
+                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0" Padding="{TemplateBinding Padding}">
+                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                                    <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                                </StackPanel>
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                        </Trigger>
+
+                        <Trigger Property="IsChecked" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="Transparent" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Height" Value="22" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+        <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+        <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Button}">
+                    <Grid SnapsToDevicePixels="True">
+                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="0" />
+                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0">
+                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="0" Padding="{TemplateBinding Padding}">
+                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                                    <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                                </StackPanel>
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" />
+                        </Trigger>
+
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                        </Trigger>
+
+                        <Trigger Property="IsPressed" Value="True">
+                            <Setter Property="Background" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="Black" />
+
+    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+        <Grid>
+            <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+            <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                        <SkewTransform AngleX="0" AngleY="0" />
+                        <RotateTransform Angle="-90" />
+                        <TranslateTransform X="0" Y="0" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+            <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+                <Path.RenderTransform>
+                    <TransformGroup>
+                        <ScaleTransform ScaleX="1" ScaleY="1" />
+                        <SkewTransform AngleX="0" AngleY="0" />
+                        <RotateTransform Angle="135" />
+                        <TranslateTransform X="0" Y="0" />
+                    </TransformGroup>
+                </Path.RenderTransform>
+            </Path>
+        </Grid>
+        <ControlTemplate.Triggers>
+            <Trigger Property="IsChecked" Value="true">
+                <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+                <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+                <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+            </Trigger>
+        </ControlTemplate.Triggers>
+    </ControlTemplate>
+
+    <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+        <Setter Property="Padding" Value="0" />
+        <Setter Property="Background" Value="#FFF0F0F0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="Auto" />
+                            <RowDefinition Height="*" x:Name="ContentRow" />
+                        </Grid.RowDefinitions>
+                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="20" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                                <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                            </Grid>
+                        </Border>
+                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="{x:Static SystemColors.ControlBrush}" Padding="10 0 0 0">
+                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+        <Setter Property="Padding" Value="10 0 0 0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type Expander}">
+                    <Grid>
+                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                            </Border>
+                        </Border>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsExpanded" Value="True">
+                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ContextMenu x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type pg:PropertyGrid}, 
+                  ResourceId=SelectedObjectAdvancedOptionsMenu}">
+        <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+    </ContextMenu>
+
+    <Style TargetType="{x:Type pg:PropertyItemBase}">
+      <Setter Property="Background" Value="{x:Static SystemColors.WindowBrush}" />
+      <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->       
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="None"/>
+      <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
+                    <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" 
+                            ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                            <Grid.ColumnDefinitions>
+                                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
+                                <ColumnDefinition Width="*" />
+                            </Grid.ColumnDefinitions>
+                            <Grid.RowDefinitions>
+                                <RowDefinition />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                     <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
+                            <Border x:Name="PART_Name"
+                                    Background="{TemplateBinding Background}" 
+                             Margin="0,0,1,0" 
+                             VerticalAlignment="Stretch" 
+                             HorizontalAlignment="Stretch" >
+                        <Grid Margin="2,2,2,2" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="*" />
+                                        <ColumnDefinition Width="Auto" />
+                                    </Grid.ColumnDefinitions>
+
+                                    <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="15" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+
+                              <ToggleButton Grid.Column="0"
+                                            Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" 
+                                         HorizontalAlignment="Stretch" 
+                                         VerticalAlignment="Center"
+                                         TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                                    <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}">
+
+                                        <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding AdvancedOptionsIcon, RelativeSource={RelativeSource TemplatedParent}}"
+                                     ToolTip="{Binding AdvancedOptionsTooltip, RelativeSource={RelativeSource TemplatedParent}}" />
+                                    </Grid>
+                                </Grid>
+                            </Border>
+
+                            <Border x:Name="PART_Editor" Grid.Column="1" 
+                                                               Background="{TemplateBinding Background}" 
+                           VerticalAlignment="Stretch" 
+                           HorizontalAlignment="Stretch">
+                        <ContentControl x:Name="PART_ValueContainer" 
+                                          Content="{TemplateBinding Editor}" 
+                                          Focusable="False" IsTabStop="False" 
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                        IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                                </ContentControl>
+                            </Border>
+
+                            <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                                <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                 ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}">
+                                    <ItemsControl.ItemsPanel>
+                                        <ItemsPanelTemplate>
+                                            <VirtualizingStackPanel />
+                                        </ItemsPanelTemplate>
+                                    </ItemsControl.ItemsPanel>
+                                </pg:PropertyItemsControl>
+                            </Expander>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="PART_Name" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter TargetName="PART_Name" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" TargetName="PART_ValueContainer"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
+                        </Trigger>
+                        <Trigger Property="Validation.HasError" Value="true">
+                            <Setter Property="ToolTip"
+                                Value="{Binding RelativeSource={x:Static RelativeSource.Self}, Path=(Validation.Errors).CurrentItem.ErrorContent}"/>
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type pg:PropertyGrid}">
+        <Style.Resources>
+            <pgconv:SelectedObjectConverter x:Key="objectConverter" />
+        </Style.Resources>
+
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="SelectedObjectType" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
+        <Setter Property="SelectedObjectTypeName" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=TypeName}" />
+        <Setter Property="SelectedObjectName" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject.Name, FallbackValue={StaticResource EmptyString}}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Margin="{TemplateBinding Padding}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto" />
+                                <RowDefinition />
+                                <RowDefinition Height="5" />
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+
+                            <StackPanel Orientation="Horizontal" Margin="6,2,0,4"
+                                 Visibility="{Binding ShowTitle, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" />
+                                <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
+                            </StackPanel>
+
+                            <Grid x:Name="toolsContainer" Grid.Row="1" Margin="4,0,4,4">
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                </Grid.ColumnDefinitions>
+                                <Grid x:Name="sortButtonContainer" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <StackPanel Orientation="Horizontal" Margin="1" >
+                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                            <Image Source="./../Images/Categorize16.png" Width="16" Height="16" />
+                                        </RadioButton>
+                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
+                                           VerticalAlignment="Center"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                            <Image Source="./../Images/SortAscending16.png" Width="16" Height="16" />
+                                        </RadioButton>
+                                    </StackPanel>
+                                </Grid>
+
+                                <Border x:Name="searchBoxContainer" Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                    <Grid>
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="*" />
+                                            <ColumnDefinition Width="Auto" />
+                                        </Grid.ColumnDefinitions>
+                                        <local:WatermarkTextBox x:Name="_txtFilter"
+                                                      Background="Transparent" 
+                                                      Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                      Watermark="{TemplateBinding FilterWatermark}">
+                                            <local:WatermarkTextBox.Style>
+                                                <Style TargetType="Control">
+                                                    <Setter Property="BorderThickness" Value="0" />
+                                                    <Style.Triggers>
+                                                        <Trigger Property="IsMouseOver" Value="True">
+                                                            <Setter Property="BorderThickness" Value="1" />
+                                                        </Trigger>
+                                                    </Style.Triggers>
+                                                </Style>
+                                            </local:WatermarkTextBox.Style>
+
+                                        </local:WatermarkTextBox>
+
+                                        <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                            <Image Source="./../Images/ClearFilter16.png" Width="16" Height="16" />
+                                        </Button>
+                                    </Grid>
+                                </Border>
+                            </Grid>
+
+                            <Grid Grid.Row="2" Background="{x:Static SystemColors.WindowBrush}">
+                                <ScrollViewer VerticalScrollBarVisibility="Auto">
+                                    <pg:PropertyItemsControl  x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                     ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     Background="{x:Static SystemColors.ControlBrush}"
+                                                     VerticalAlignment="Top">
+                                        <ItemsControl.ItemsPanel>
+                                            <ItemsPanelTemplate>
+                                                <VirtualizingStackPanel />
+                                            </ItemsPanelTemplate>
+                                        </ItemsControl.ItemsPanel>
+
+                                        <ItemsControl.GroupStyle>
+                                            <GroupStyle>
+                                                <GroupStyle.ContainerStyle>
+                                                    <Style TargetType="{x:Type GroupItem}">
+                                                        <Setter Property="Template">
+                                                            <Setter.Value>
+                                                                <ControlTemplate>
+                                                                    <Border>
+                                                                        <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                                            <ItemsPresenter />
+                                                                        </Expander>
+                                                                    </Border>
+                                                                </ControlTemplate>
+                                                            </Setter.Value>
+                                                        </Setter>
+                                                    </Style>
+                                                </GroupStyle.ContainerStyle>
+                                            </GroupStyle>
+                                        </ItemsControl.GroupStyle>
+
+                                    </pg:PropertyItemsControl>
+                                </ScrollViewer>
+
+                                <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                                    <Thumb.Template>
+                                        <ControlTemplate>
+                                            <Border Background="Transparent" />
+                                        </ControlTemplate>
+                                    </Thumb.Template>
+                                </Thumb>
+
+                            </Grid>
+
+                            <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                            <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding ShowSummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedPropertyItem.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                                <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedPropertyItem.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                            </StackPanel>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition SourceName="searchBoxContainer" Property="Visibility" Value="Collapsed"/>
+                                <Condition SourceName="sortButtonContainer" Property="Visibility" Value="Collapsed"/>
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="toolsContainer" Property="Visibility" Value="Collapsed" />
+                        </MultiTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
index 37667b92e..89a5c0f8b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -253,8 +253,8 @@
                         <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
                      </Grid>
                   </Border>
-                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
-                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="{x:Static SystemColors.ControlBrush}" Padding="10 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
                         <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
                      </Border>
                   </Border>
@@ -293,31 +293,42 @@
       </Setter>
    </Style>
 
-   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+   <ContextMenu x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type pg:PropertyGrid}, 
+                  ResourceId=SelectedObjectAdvancedOptionsMenu}">
       <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
    </ContextMenu>
 
-   <Style TargetType="{x:Type pg:PropertyItem}">
-      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
-      <Setter Property="BorderThickness" Value="1" />
+   <Style TargetType="{x:Type pg:PropertyItemBase}">
+      <Setter Property="Background" Value="{x:Static SystemColors.WindowBrush}" />
+      <!-- Set the margin at 1 pixel bottom to let the horizontal "line" effect appear. -->
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
       <Setter Property="Focusable" Value="True" />
-      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True"/>
+      <Setter Property="KeyboardNavigation.DirectionalNavigation" Value="None"/>
       <Setter Property="Template">
          <Setter.Value>
-            <ControlTemplate TargetType="{x:Type pg:PropertyItem}">
-               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" ContextMenuService.Placement="Bottom">
-                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+            <ControlTemplate TargetType="{x:Type pg:PropertyItemBase}">
+               <Border ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}}" 
+                       ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Stretch" HorizontalAlignment="Stretch" >
                      <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type pg:PropertyGrid}}}" />
                         <ColumnDefinition Width="*" />
                      </Grid.ColumnDefinitions>
                      <Grid.RowDefinitions>
                         <RowDefinition />
-                        <RowDefinition />
+                        <RowDefinition Height="Auto" />
                      </Grid.RowDefinitions>
 
-                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
-                        <Grid Margin="2,2,2,2">
+                     <!-- Set the BorderThickness at 1 pixel to the right to let the "vertical line" appear -->
+                     <Border x:Name="PART_Name"
+                             Background="{TemplateBinding Background}" 
+                             Margin="0,0,1,0" 
+                             VerticalAlignment="Stretch" 
+                             HorizontalAlignment="Stretch">
+                        <Grid Margin="2,2,2,2" VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
                            <Grid.ColumnDefinitions>
                               <ColumnDefinition Width="*" />
                               <ColumnDefinition Width="Auto" />
@@ -329,14 +340,16 @@
                                  <ColumnDefinition Width="*" />
                               </Grid.ColumnDefinitions>
 
-                              <Border Grid.Column="0">
-                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
-                                               OverridesDefaultStyle="True"
-                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                               Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                              </Border>
+                              <ToggleButton Grid.Column="0"
+                                            Template="{StaticResource ExpanderToggleButton}"
+                                            OverridesDefaultStyle="True"
+                                            IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                            Visibility="{Binding IsExpandable, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
 
-                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" 
+                                         HorizontalAlignment="Stretch" 
+                                         VerticalAlignment="Center"
+                                         TextTrimming="CharacterEllipsis" />
                            </Grid>
 
                            <Grid Grid.Column="1"
@@ -355,19 +368,28 @@
                         </Grid>
                      </Border>
 
-                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
-                        <ContentControl x:Name="content" Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" 
-                                        IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}"/>
+                     <Border x:Name="PART_Editor" Grid.Column="1" 
+                           Background="{TemplateBinding Background}" 
+                           VerticalAlignment="Stretch" 
+                           HorizontalAlignment="Stretch">
+                        <ContentControl x:Name="PART_ValueContainer" 
+                                          Content="{TemplateBinding Editor}" 
+                                          Focusable="False" IsTabStop="False" 
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=pg:PropertyGrid}, Converter={StaticResource InverseBoolConverter}}" >
+                        </ContentControl>
                      </Border>
 
                      <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
-                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                        <pg:PropertyItemsControl x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                 ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                 ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}">
                            <ItemsControl.ItemsPanel>
                               <ItemsPanelTemplate>
                                  <VirtualizingStackPanel />
                               </ItemsPanelTemplate>
                            </ItemsControl.ItemsPanel>
-                        </ItemsControl>
+                        </pg:PropertyItemsControl>
                      </Expander>
                   </Grid>
                </Border>
@@ -380,7 +402,7 @@
                      <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
                   </Trigger>
                   <Trigger Property="IsEnabled" Value="False">
-                     <Setter Property="Foreground" TargetName="content"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
+                     <Setter Property="Foreground" TargetName="PART_ValueContainer"  Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"  />
                   </Trigger>
                   <Trigger Property="Validation.HasError" Value="true">
                         <Setter Property="ToolTip"
@@ -396,8 +418,7 @@
       <Style.Resources>
          <pgconv:SelectedObjectConverter x:Key="objectConverter" />
       </Style.Resources>
-      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
-      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="Background" Value="#BCC7D8" />
       <Setter Property="BorderBrush" Value="#43577B" />
       <Setter Property="BorderThickness" Value="1" />
       <Setter Property="SelectedObjectType" Value="{Binding RelativeSource={RelativeSource Self}, Path=SelectedObject, Converter={StaticResource objectConverter}, ConverterParameter=Type}" />
@@ -407,7 +428,7 @@
          <Setter.Value>
             <ControlTemplate TargetType="{x:Type pg:PropertyGrid}">
                <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                  <Grid>
+                  <Grid Margin="{TemplateBinding Padding}">
                      <Grid.RowDefinitions>
                         <RowDefinition Height="Auto"/>
                         <RowDefinition Height="Auto" />
@@ -427,19 +448,19 @@
                            <ColumnDefinition Width="Auto" />
                            <ColumnDefinition Width="*" />
                         </Grid.ColumnDefinitions>
-                        <Grid x:Name="sortButtonContainer" Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <Grid x:Name="sortButtonContainer" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
                            <StackPanel Orientation="Horizontal" Margin="1" >
                               <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
                                            VerticalAlignment="Center"
                                            Style="{StaticResource OptionsToggleButtonStyle}"
                                            ToolTip="Categorized">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/Categorize16.png" Width="16" Height="16" />
                               </RadioButton>
                               <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                            VerticalAlignment="Center"
                                            Style="{StaticResource OptionsToggleButtonStyle}"
                                            ToolTip="Alphabetical">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/SortAscending16.png" Width="16" Height="16" />
                               </RadioButton>
                            </StackPanel>
                         </Grid>
@@ -471,15 +492,19 @@
                                       Command="commands:PropertyGridCommands.ClearFilter"
                                       Style="{StaticResource ClearFilterButtonStyle}"
                                       HorizontalAlignment="Left">
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                                 <Image Source="./../Images/ClearFilter16.png" Width="16" Height="16" />
                               </Button>
                            </Grid>
                         </Border>
                      </Grid>
 
-                     <Grid Grid.Row="2" Background="White">
-                        <ScrollViewer VerticalScrollBarVisibility="Auto">
-                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                     <Grid Grid.Row="2" Background="{x:Static SystemColors.WindowBrush}">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto" >
+                           <pg:PropertyItemsControl  x:Name="PART_PropertyItemsControl" IsTabStop="False" Focusable="False"
+                                                     ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     ItemContainerStyle="{Binding PropertyContainerStyle, RelativeSource={RelativeSource TemplatedParent}}"
+                                                     Background="{x:Static SystemColors.ControlBrush}"
+                                                     VerticalAlignment="Top">
                               <ItemsControl.ItemsPanel>
                                  <ItemsPanelTemplate>
                                     <VirtualizingStackPanel />
@@ -493,10 +518,8 @@
                                           <Setter Property="Template">
                                              <Setter.Value>
                                                 <ControlTemplate>
-                                                   <Border Background="{TemplateBinding Background}"
-                                                           BorderBrush="{TemplateBinding BorderBrush}"
-                                                           BorderThickness="{TemplateBinding BorderThickness}">
-                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                   <Border >
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True" >
                                                          <ItemsPresenter />
                                                       </Expander>
                                                    </Border>
@@ -508,7 +531,7 @@
                                  </GroupStyle>
                               </ItemsControl.GroupStyle>
 
-                           </ItemsControl>
+                           </pg:PropertyItemsControl>
                         </ScrollViewer>
 
                          <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
index 5e99ae536..ddbdfd465 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Documents;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
index 4de259e29..bb6d1ff3d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Documents;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
index 4b038750d..aaca7b13a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.IO;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
index 2a4ff7e40..30ed667a9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.IO;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index 90d1a1687..3e42b0287 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -25,8 +25,8 @@ public class RichTextBox : System.Windows.Controls.RichTextBox
   {
     #region Private Members
 
-    private bool _textSetInternally;
-    bool _surpressGetText;
+    private bool _preventDocumentUpdate;
+    private bool _preventTextUpdate;
 
     #endregion //Private Members
 
@@ -63,24 +63,7 @@ public string Text
 
     private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      RichTextBox rtb = ( RichTextBox )d;
-
-      // if the text is not being set internally then load the text into the RichTextBox
-      if( !rtb._textSetInternally )
-      {
-        //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
-        //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
-        //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
-        rtb._surpressGetText = true;
-        DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke( new Action( delegate()
-            {
-              rtb.TextFormatter.SetText( rtb.Document, ( string )e.NewValue );
-            } ), DispatcherPriority.Background );
-        dop.Completed += ( sender, ea ) =>
-            {
-              rtb._surpressGetText = false;
-            };
-      }
+      ( ( RichTextBox )d ).UpdateDocumentFromText();
     }
 
     private static object CoerceTextProperty( DependencyObject d, object value )
@@ -92,30 +75,31 @@ private static object CoerceTextProperty( DependencyObject d, object value )
 
     #region TextFormatter
 
-    private ITextFormatter _textFormatter;
-    /// <summary>
-    /// The ITextFormatter the is used to format the text of the RichTextBox.
-    /// Deafult formatter is the RtfFormatter
-    /// </summary>
+    public static readonly DependencyProperty TextFormatterProperty = DependencyProperty.Register( "TextFormatter", typeof( ITextFormatter ), typeof( RichTextBox ), new FrameworkPropertyMetadata( new RtfFormatter(), OnTextFormatterPropertyChanged ) );
     public ITextFormatter TextFormatter
     {
       get
       {
-        if( _textFormatter == null )
-          _textFormatter = new RtfFormatter(); //default is rtf
-
-        return _textFormatter;
+        return ( ITextFormatter )GetValue( TextFormatterProperty );
       }
       set
       {
-        if( _textFormatter != value )
-        {
-          _textFormatter = value;
-          _textFormatter.SetText( Document, Text );
-        }
+        SetValue( TextFormatterProperty, value );
       }
     }
 
+    private static void OnTextFormatterPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBox richTextBox = d as RichTextBox;
+      if( richTextBox != null )
+        richTextBox.OnTextFormatterPropertyChanged( ( ITextFormatter )e.OldValue, ( ITextFormatter )e.NewValue );
+    }
+
+    protected virtual void OnTextFormatterPropertyChanged( ITextFormatter oldValue, ITextFormatter newValue )
+    {
+      this.UpdateTextFromDocument();
+    }
+
     #endregion //TextFormatter
 
     #endregion //Properties
@@ -125,17 +109,27 @@ public ITextFormatter TextFormatter
     protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
     {
       base.OnTextChanged( e );
-      UpdateText();
+      UpdateTextFromDocument();
     }
 
-    private void UpdateText()
+    private void UpdateTextFromDocument()
     {
-      _textSetInternally = true;
+      if( _preventTextUpdate )
+        return;
 
-      if( !_surpressGetText )
-        Text = TextFormatter.GetText( Document );
+      _preventDocumentUpdate = true;
+      Text = TextFormatter.GetText( Document );
+      _preventDocumentUpdate = false;
+    }
 
-      _textSetInternally = false;
+    private void UpdateDocumentFromText()
+    {
+      if( _preventDocumentUpdate )
+        return;
+
+      _preventTextUpdate = true;
+      TextFormatter.SetText( Document, Text );
+      _preventTextUpdate = false;
     }
 
     /// <summary>
@@ -146,6 +140,28 @@ public void Clear()
       Document.Blocks.Clear();
     }
 
+    public override void BeginInit()
+    {
+      base.BeginInit();
+      // Do not update anything while initializing. See EndInit
+      _preventTextUpdate = true;
+      _preventDocumentUpdate = true;
+    }
+
+    public override void EndInit()
+    {
+      base.EndInit();
+      _preventTextUpdate = false;
+      _preventDocumentUpdate = false;
+      // Possible conflict here if the user specifies 
+      // the document AND the text at the same time 
+      // in XAML. Text has priority.
+      if( !string.IsNullOrEmpty( Text ) )
+        UpdateDocumentFromText();
+      else
+        UpdateTextFromDocument();
+    }
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
index 0b8f522e6..27469dc0f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
index 5ef300240..b00978011 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <UserControl x:Class="Xceed.Wpf.Toolkit.RichTextBoxFormatBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
@@ -191,7 +191,7 @@
                               </Grid.ColumnDefinitions>
 
                               <Grid>
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
+                                 <Image Source="./Images/FontColorPicker16.png" Width="16" Height="16" />
                                  <Rectangle Grid.Row="1"
                                             Height="4"
                                             Margin="0,12,0,0"
@@ -286,7 +286,7 @@
                               </Grid.ColumnDefinitions>
 
                               <Grid>
-                                 <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
+                                 <Image Source="./Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
                                  <Rectangle Grid.Row="1"
                                             Height="4"
                                             Margin="0,12,0,0"
@@ -392,7 +392,7 @@
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              Click="Bullets_Clicked"
                              ToolTip="Bullets">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Bullets16.png" />
+                  <Image Source="./Images/Bullets16.png" />
                </ToggleButton>
 
                <ToggleButton x:Name="_btnNumbers"
@@ -401,7 +401,7 @@
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              Click="Numbers_Clicked"
                              ToolTip="Numbering">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Numbering16.png" />
+                  <Image Source="./Images/Numbering16.png" />
                </ToggleButton>
 
             </StackPanel>
@@ -412,21 +412,21 @@
                              Command="EditingCommands.ToggleBold"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Bold">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Bold16.png" />
+                  <Image Source="./Images/Bold16.png" />
                </ToggleButton>
                <ToggleButton x:Name="_btnItalic"
                              Style="{StaticResource FormatBarToggleButtonStyle}"
                              Command="{x:Static EditingCommands.ToggleItalic}"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Italic">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Italic16.png" />
+                  <Image Source="./Images/Italic16.png" />
                </ToggleButton>
                <ToggleButton x:Name="_btnUnderline"
                              Style="{StaticResource FormatBarToggleButtonStyle}"
                              Command="{x:Static EditingCommands.ToggleUnderline}"
                              CommandTarget="{Binding ElementName=_window, Path=Target}"
                              ToolTip="Underline">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/Underline16.png" />
+                  <Image Source="./Images/Underline16.png" />
                </ToggleButton>
 
                <Separator />
@@ -436,21 +436,21 @@
                             Command="{x:Static EditingCommands.AlignLeft}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Left">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+                  <Image Source="./Images/LeftAlign16.png" />
                </RadioButton>
                <RadioButton x:Name="_btnAlignCenter"
                             Style="{StaticResource FormatBarToggleButtonStyle}"
                             Command="{x:Static EditingCommands.AlignCenter}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Center">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+                  <Image Source="./Images/CenterAlign16.png" />
                </RadioButton>
                <RadioButton x:Name="_btnAlignRight"
                             Style="{StaticResource FormatBarToggleButtonStyle}"
                             Command="{x:Static EditingCommands.AlignRight}"
                             CommandTarget="{Binding ElementName=_window, Path=Target}"
                             ToolTip="Align Right">
-                  <Image Source="/Xceed.Wpf.Toolkit;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+                  <Image Source="./Images/RightAlign16.png" />
                </RadioButton>
 
                <Separator />
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
index 9a94c379a..0b9a59441 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
@@ -21,6 +21,7 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core;
 using System.Linq;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -76,7 +77,7 @@ public RichTextBoxFormatBar()
       InitializeComponent();
       Loaded += FormatToolbar_Loaded;
 
-      _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies.OrderBy( fontFamily => fontFamily.Source );
+      _cmbFontFamilies.ItemsSource = FontUtilities.Families.OrderBy( fontFamily => fontFamily.Source );
       _cmbFontSizes.ItemsSource = FontSizes;
     }
 
@@ -166,14 +167,24 @@ private void UpdateToggleButtonState()
 
     void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
     {
-      object currentValue = Target.Selection.GetPropertyValue( formattingProperty );
-      button.IsChecked = ( currentValue == DependencyProperty.UnsetValue ) ? false : currentValue != null && currentValue.Equals( expectedValue );
+      object currentValue = DependencyProperty.UnsetValue;
+      if( (Target != null) && (Target.Selection != null) )
+      {
+        currentValue = Target.Selection.GetPropertyValue( formattingProperty );
+      }
+      button.IsChecked = ( (currentValue == null) || ( currentValue == DependencyProperty.UnsetValue ) )
+                          ? false 
+                          : currentValue != null && currentValue.Equals( expectedValue );
     }
 
     private void UpdateSelectedFontFamily()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
-      FontFamily currentFontFamily = ( FontFamily )( ( value == DependencyProperty.UnsetValue ) ? null : value );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
+      }
+      FontFamily currentFontFamily = ( FontFamily )( ( ( value == null) || ( value == DependencyProperty.UnsetValue ) ) ? null : value );
       if( currentFontFamily != null )
       {
         _cmbFontFamilies.SelectedItem = currentFontFamily;
@@ -182,21 +193,39 @@ private void UpdateSelectedFontFamily()
 
     private void UpdateSelectedFontSize()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
-      _cmbFontSizes.SelectedValue = ( value == DependencyProperty.UnsetValue ) ? null : value;
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
+      }
+
+      _cmbFontSizes.SelectedValue = ( ( value == null ) || ( value == DependencyProperty.UnsetValue ) ) ? null : value;
     }
 
     private void UpdateFontColor()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
-      Color currentColor = ( Color )( ( value == DependencyProperty.UnsetValue ) ? Colors.Black : ( ( SolidColorBrush )value ).Color );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
+      }
+
+      Color currentColor = ( Color )( ( (value == null) || ( value == DependencyProperty.UnsetValue ) )
+                                    ? Colors.Black 
+                                    : ( ( SolidColorBrush )value ).Color );
       _cmbFontColor.SelectedColor = currentColor;
     }
 
     private void UpdateFontBackgroundColor()
     {
-      object value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
-      Color currentColor = ( Color )( ( value == null || value == DependencyProperty.UnsetValue ) ? Colors.Transparent : ( ( SolidColorBrush )value ).Color );
+      object value = DependencyProperty.UnsetValue;
+      if( ( Target != null ) && ( Target.Selection != null ) )
+      {
+        value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
+      }
+      Color currentColor = ( Color )( ( (value == null ) || (value == DependencyProperty.UnsetValue) )
+                                      ? Colors.Transparent 
+                                      : ( ( SolidColorBrush )value ).Color );
       _cmbFontBackgroundColor.SelectedColor = currentColor;
     }
 
@@ -209,8 +238,12 @@ private void UpdateSelectionListType()
       _btnBullets.IsChecked = false;
       _btnNumbers.IsChecked = false;
 
-      Paragraph startParagraph = Target.Selection.Start.Paragraph;
-      Paragraph endParagraph = Target.Selection.End.Paragraph;
+      Paragraph startParagraph = ( ( Target != null ) && ( Target.Selection != null ) ) 
+                                  ? Target.Selection.Start.Paragraph 
+                                  : null;
+      Paragraph endParagraph = ( ( Target != null ) && ( Target.Selection != null ) )
+                                ? Target.Selection.End.Paragraph
+                                : null;
       if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
       {
         TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
@@ -236,7 +269,7 @@ private bool BothSelectionListsAreChecked()
 
     void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
     {
-      if( value == null )
+      if( ( value == null ) || ( Target == null ) || ( Target.Selection == null ) )
         return;
 
       Target.Selection.ApplyPropertyValue( formattingProperty, value );
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index 680a97b56..c23c76f6e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
@@ -101,17 +101,17 @@ private void OnPreviewMouseMoveParentWindow( object sender, MouseEventArgs e )
       Point p = e.GetPosition( _adorner );
       double maxDist = 0d;
 
-      //Mouse is inside FormatBar : Nothing to do
+      //Mouse is inside FormatBar: Nothing to do.
       if( ( p.X >= 0 ) && ( p.X <= _adorner.ActualWidth ) && ( p.Y >= 0 ) && ( p.Y <= _adorner.ActualHeight ) )
       {
         return;
       }
-      //Mouse is too much outside FormatBar : Close it
+      //Mouse is too much outside FormatBar: Close it.
       else if( ( p.X < -_hideAdornerDistance ) || ( p.X > _adorner.ActualWidth + _hideAdornerDistance ) || ( p.Y < -_hideAdornerDistance ) || ( p.Y > _adorner.ActualHeight + _hideAdornerDistance ) )
       {
         HideAdorner();
       }
-      //Mouse is just outside FormatBar : Vary its Opacity
+      //Mouse is just outside FormatBar: Vary its opacity.
       else
       {
         if( p.X < 0 )
@@ -130,13 +130,13 @@ private void OnPreviewMouseMoveParentWindow( object sender, MouseEventArgs e )
 
     private void OnMouseLeaveParentWindow( object sender, MouseEventArgs e )
     {
-      // Mouse is outside parent Window : Close it
+      // Mouse is outside parent Window: Close it.
       HideAdorner();
     }
 
     void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
     {
-      //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
+      //This fixes the bug when applying text transformations the text would lose it's highlight. That was because the RichTextBox was losing focus,
       //so we just give it focus again and it seems to do the trick of re-highlighting it.
       if( !_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty )
         _richTextBox.Focus();
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
index e090d8f56..e45d20ad4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..dc2b5b6a6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,122 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+
+    <!-- =============================================================================== -->
+    <!-- SplitButton                                                                     -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:SplitButton}">
+        <Setter Property="BorderThickness" Value="2" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="HorizontalContentAlignment" Value="Center" />
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:SplitButton}">
+                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}">
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                                    <Button.Template>
+                                        <ControlTemplate TargetType="Button">
+                                            <ContentPresenter />
+                                        </ControlTemplate>
+                                    </Button.Template>
+                                    <Grid>
+                                        <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                             Background="{TemplateBinding Background}" 
+                                                             BorderThickness="1,1,0,1"
+                                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											                 RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                 RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                            <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                                        </chrome:ButtonChrome>
+                                    </Grid>
+                                </Button>
+                                <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                                    <ToggleButton.Template>
+                                        <ControlTemplate TargetType="ToggleButton">
+                                            <ContentPresenter />
+                                        </ControlTemplate>
+                                    </ToggleButton.Template>
+                                    <Grid>
+                                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                             Background="{TemplateBinding Background}" 
+                                                             Padding="1,0,1,0"
+                                                             RenderChecked="{TemplateBinding IsOpen}"
+                                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											                 RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                 RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                            <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                                <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                            </Grid>
+                                        </chrome:ButtonChrome>
+                                    </Grid>
+                                </ToggleButton>
+                            </Grid>
+                        </chrome:ButtonChrome>
+
+                        <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                            <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                            <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                <ContentPresenter x:Name="PART_ContentPresenter" Content="{TemplateBinding DropDownContent}" />
+                            </Border>
+                        </Popup>
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                            <Setter TargetName="ActionButtonChrome" Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index 5b49e9f4d..99642ce83 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -1,24 +1,25 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
                     xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
-                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
 
    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
 
@@ -47,7 +48,7 @@
       <Setter Property="IsTabStop" Value="False" />
       <Setter Property="HorizontalContentAlignment" Value="Center" />
       <Setter Property="VerticalContentAlignment" Value="Center" />
-      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
       <Setter Property="Padding" Value="3" />
       <Setter Property="Template">
          <Setter.Value>
@@ -67,8 +68,8 @@
                            </Button.Template>
                            <Grid>
                               <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
-                                                   RenderNormal="False"
+                                                   BorderThickness="1,1,0,1"
+                                                   CornerRadius="2.75, 0, 0, 2.75"
                                                    RenderEnabled="{TemplateBinding IsEnabled}"
 											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
 											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
@@ -87,9 +88,9 @@
                               </ControlTemplate>
                            </ToggleButton.Template>
                            <Grid>
-                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                                   Padding="1,0,1,0"
                                                    CornerRadius="0, 2.75, 2.75, 0"
-                                                   RenderNormal="False"
                                                    RenderChecked="{TemplateBinding IsOpen}"
                                                    RenderEnabled="{TemplateBinding IsEnabled}"
 											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs
new file mode 100644
index 000000000..325edc669
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/StylableWindow/Implementation/Converters/StylableWindowClippingBorderConverter.cs
@@ -0,0 +1,42 @@
+﻿/*************************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Windows.Data;
+using System.Globalization;
+using System.Windows;
+
+namespace Xceed.Wpf.Toolkit.Converters
+{
+  public class StylableWindowClippingBorderConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      Type aa = value.GetType();
+      Type b = parameter.GetType();
+      double borderThickness = ( double )value - double.Parse( (string)parameter );
+      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+}
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
index b8dd1d700..6224595a9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
index 770c840e8..6c5cee81d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
index 3417322db..c8b55270c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..f64c234fc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,58 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <ResourceDictionary.MergedDictionaries>
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Brushes.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Buttons.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Themes/Aero2/Common.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Chromes/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/BusyIndicator/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ButtonSpinner/Themes/Aero2.NormalColor.xaml" />
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Calculator/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CalculatorUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Aero2/WindowControl.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Aero2/SelectorItem.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CollectionControl/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorCanvas/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ColorPicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DropDownButton/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MessageBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimeUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/DateTimePicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/NumericUpDown/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/SplitButton/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/PropertyGrid/Themes/Aero2.NormalColor.xaml" />
+
+
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/TimePicker/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/WatermarkTextBox/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Wizard/Themes/Aero2.NormalColor.xaml" />
+        <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Zoombox/Themes/Aero2.NormalColor.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
new file mode 100644
index 000000000..2024b5895
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
@@ -0,0 +1,51 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<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"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+
+    <!-- Control -->
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#FFF4F4F4" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" Color="#FFABADB3" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" Color="#FF7EB4EA" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlSelectedBorderKey}" Color="#FF569DE5" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" Color="Red" options:Freeze="true" />
+
+    <!-- Button -->
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" Color="#FFDDDDDD" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" Color="#FFBEE6FD" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" Color="#FFC4E5F6" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="Red" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" Color="Orange" options:Freeze="true" />
+    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#FFADB2B5" options:Freeze="true" />
+
+    <!-- Up/Down Glyphs -->
+    <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+    <SolidColorBrush options:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#FFA9A9A9" />
+
+    <!-- SpinButton CornerRadius -->
+    <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" options:Freeze="true" />
+
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
new file mode 100644
index 000000000..bbb5b937f
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
@@ -0,0 +1,50 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes">
+
+    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="2,2" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="RepeatButton">
+                    <Grid>
+                        <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
new file mode 100644
index 000000000..9465cc301
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
@@ -0,0 +1,141 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
+                    xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
+
+    <!-- =============================================================================== -->
+    <!-- Geometry for Close/Minimize/Maximize buttons                                    -->
+    <!-- =============================================================================== -->
+    <Geometry x:Key="closeGeometry">
+        M1,0 L0,1 3,4 0,7 1,8 2,8 2,7 4,5 7,8 8,8 8,7 5,4 8,1 7,0 5,2 5,3 4,3 1,0
+    </Geometry>
+    <Geometry x:Key="minimizeGeometry">
+        M0,0 L8,0 8,1 8,2 0,2 0,1 z
+    </Geometry>
+    <Geometry x:Key="maximizeGeometry">
+        M0,0 L8,0 8,1 0,1 z M0,0 L8,0 8,8 0,8 z
+    </Geometry>
+
+
+    <!-- =============================================================================== -->
+    <!-- Common Styles                                                                   -->
+    <!-- Need to find a way to share these for WindowControl and StylableWindow          -->
+    <!-- =============================================================================== -->
+
+    <!-- ResizeGrip -->
+    <ImageBrush x:Key="resize_grip"
+                ImageSource="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/resize_grip.png" />
+
+    <!-- New Button Template without MouseOver and Pressed triggers -->
+    <ControlTemplate x:Key="WindowButtonTemplate" TargetType="Button">
+        <Border Name="border" 
+                Padding="1" 
+                BorderThickness="0"
+                Background="{TemplateBinding Background}">
+            <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+        </Border>
+    </ControlTemplate>
+
+    <!--Default Close button style-->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}" TargetType="Button" >
+        <Setter Property="Background" Value="#FFC75050" />
+        <Setter Property="OverridesDefaultStyle" Value="True" />
+        <Setter Property="Template" Value="{StaticResource WindowButtonTemplate}" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
+                <Setter Property="Background" Value="#FFBCBCBC" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Background" Value="#FFE04343" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+                <Setter Property="Background" Value="#FF993D3D" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+
+
+    <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="Gray" />
+
+    <SolidColorBrush x:Key="Window_WindowBackground" Color="{x:Static media:WindowColors.ColorizationColor}" />
+
+    <SolidColorBrush x:Key="Window_Background"  Color="White"/>
+
+    <SolidColorBrush x:Key="Window_WindowInactiveBackground" Color="#FFEBEBEB" />
+
+    <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
+
+    <SolidColorBrush x:Key="Window_CaptionShadowBrush" Color="Transparent" />
+
+    <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
+
+    <!-- Panel Background -->
+    <LinearGradientBrush x:Key="PanelBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFF0F0F0" />
+                <GradientStop Offset="1" Color="#FFE5E5E5" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!-- Popup Background -->
+    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+        <LinearGradientBrush.GradientStops>
+            <GradientStopCollection>
+                <GradientStop Offset="0" Color="#FFF0F0F0" />
+                <GradientStop Offset="1" Color="#FFE5E5E5" />
+            </GradientStopCollection>
+        </LinearGradientBrush.GradientStops>
+    </LinearGradientBrush>
+
+    <!-- Popup Border -->
+    <SolidColorBrush x:Key="PopupDarkBorderBrush" Color="#FFABADB3" />
+
+
+    <!-- =============================================================================== -->
+    <!-- ColorCanvas, ColorPicker                                                        -->
+    <!-- =============================================================================== -->
+
+    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+        <DrawingBrush.Drawing>
+            <DrawingGroup>
+                <GeometryDrawing Brush="White">
+                    <GeometryDrawing.Geometry>
+                        <RectangleGeometry Rect="0,0 100,100" />
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+                <GeometryDrawing Brush="LightGray">
+                    <GeometryDrawing.Geometry>
+                        <GeometryGroup>
+                            <RectangleGeometry Rect="0,0 50,50" />
+                            <RectangleGeometry Rect="50,50 50,50" />
+                        </GeometryGroup>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingBrush.Drawing>
+    </DrawingBrush>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
new file mode 100644
index 000000000..94bac7f6c
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
@@ -0,0 +1,67 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes">
+
+    <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+
+    <DataTemplate x:Key="IncreaseGlyphNormalKey">
+        <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+    <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+        <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="DecreaseGlyphNormalKey">
+        <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+    <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+        <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            SnapsToDevicePixels="True"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+    </DataTemplate>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
index b938877be..3637b13d5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
@@ -29,6 +29,8 @@
 
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Calculator/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Generic/WindowControl.xaml" />
+      <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/Core/Themes/Generic/SelectorItem.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckComboBox/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/CheckListBox/Themes/Generic.xaml" />
       <ResourceDictionary Source="/Xceed.Wpf.Toolkit;component/ChildWindow/Themes/Generic.xaml" />
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
index 69186e61b..b91f925f3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
index 2c9f5dcf3..e3279aa2a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
index 66feb7141..cb3e5dfd0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
@@ -1,152 +1,244 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:media="clr-namespace:Xceed.Wpf.Toolkit.Core.Media"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
                     xmlns:primitives="clr-namespace:Xceed.Wpf.Toolkit.Primitives">
 
-   <!-- =============================================================================== -->
-   <!-- Common Styles                                                                   -->
-   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
-   <!-- =============================================================================== -->
-
-   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-      <GradientStop Color="#FFA3AEB9" Offset="0" />
-      <GradientStop Color="#FF8399A9" Offset="0.375" />
-      <GradientStop Color="#FF718597" Offset="0.375" />
-      <GradientStop Color="#FF617584" Offset="1" />
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFffffff" />
-            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
-            <GradientStop Offset="1" Color="#FFd0d6db" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FFb5bdc8" />
-            <GradientStop Offset="0.370" Color="#FF8399a9" />
-            <GradientStop Offset="0.370" Color="#FF718597" />
-            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
-            <GradientStop Offset="1" Color="#FFb9c1ca" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-      <LinearGradientBrush.GradientStops>
-         <GradientStopCollection>
-            <GradientStop Offset="0" Color="#FF6b7c8d" />
-            <GradientStop Offset="0.370" Color="#FF4d606f" />
-            <GradientStop Offset="0.370" Color="#FF465460" />
-            <GradientStop Offset="0.906" Color="#FF262d33" />
-            <GradientStop Offset="1" Color="#FF262d33" />
-         </GradientStopCollection>
-      </LinearGradientBrush.GradientStops>
-   </LinearGradientBrush>
-
-   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-      <Setter Property="Foreground" Value="#FF000000" />
-      <Setter Property="Padding" Value="3" />
-      <Setter Property="BorderThickness" Value="1" />
-      <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="Button">
-               <Grid>
-                  <VisualStateManager.VisualStateGroups>
-                     <VisualStateGroup x:Name="CommonStates">
-                        <VisualState x:Name="Normal" />
-                        <VisualState x:Name="MouseOver">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                        <VisualState x:Name="Pressed">
-                           <Storyboard>
-                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
-                              </ObjectAnimationUsingKeyFrames>
-                           </Storyboard>
-                        </VisualState>
-                     </VisualStateGroup>
-                  </VisualStateManager.VisualStateGroups>
-                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
-                  </Border>
-                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
-                  <Path x:Name="path"
-                        Height="6"
-                        Width="7"
-                        Stretch="Fill"
-                        Opacity="1"
-                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-                        Fill="White"
-                        Margin="0,0,0,1"
-                        Visibility="Collapsed" />
-               </Grid>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+
+    <!-- =============================================================================== -->
+    <!-- Images for the buttons and their various states                                 -->
+    <!-- =============================================================================== -->
+
+    <!-- ResizeGrip -->
+    <ImageBrush x:Key="resize_grip" 
+                ImageSource="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/resize_grip.png" />
+
+   <Style x:Key="buttonImageStyle" TargetType="Image">
+      <Setter Property="Stretch" Value="None" />
+      <Setter Property="RenderOptions.EdgeMode" Value="Aliased" />
+      <Setter Property="RenderOptions.BitmapScalingMode" Value="NearestNeighbor" />
    </Style>
 
+    <!-- Minimize -->
+   <Image x:Key="minimize_normal"
+               Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_normal.png" />
+   <Image x:Key="minimize_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_hover.png" />
+   <Image x:Key="minimize_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_pressed.png" />
+   <Image x:Key="minimize_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/minimize_inactive.png" />
+
+    <!-- Maximize -->
+   <Image x:Key="maximize_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_normal.png" />
+   <Image x:Key="maximize_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_hover.png" />
+   <Image x:Key="maximize_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_pressed.png" />
+   <Image x:Key="maximize_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_inactive.png" />
+   <Image x:Key="maximize_disabled"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/maximize_disabled.png" />
+
+    <!-- Restore -->
+   <Image x:Key="restore_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_normal.png" />
+   <Image x:Key="restore_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_hover.png" />
+   <Image x:Key="restore_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_pressed.png" />
+   <Image x:Key="restore_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_inactive.png" />
+   <Image x:Key="restore_disabled"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/restore_disabled.png" />
+
+    <!-- Close -->
+   <Image x:Key="close_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_normal.png" />
+   <Image x:Key="close_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_hover.png" />
+   <Image x:Key="close_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_pressed.png" />
+   <Image x:Key="close_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_inactive.png" />
+
+    <!-- Close (with 2 rounded corners) -->
+   <Image x:Key="close_rounded_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_normal.png" />
+   <Image x:Key="close_rounded_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_hover.png" />
+   <Image x:Key="close_rounded_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_pressed.png" />
+   <Image x:Key="close_rounded_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_rounded_inactive.png" />
+
+    <!-- Close (for ToolWindow) -->
+   <Image x:Key="close_toolwindow_normal"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_normal.png" />
+   <Image x:Key="close_toolwindow_hover"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_hover.png" />
+   <Image x:Key="close_toolwindow_pressed"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_pressed.png" />
+   <Image x:Key="close_toolwindow_inactive"
+                Style="{StaticResource buttonImageStyle}" Source="/Xceed.Wpf.Toolkit;component/Themes/Generic/Images/close_toolwindow_inactive.png" />
 
+
+    <!-- =============================================================================== -->
+    <!-- Common Styles                                                                   -->
+    <!-- Need to find a way to share these for WindowControl and StylableWindow          -->
     <!-- =============================================================================== -->
-   <!-- SelectorItem                                                                    -->
-   <!-- =============================================================================== -->
-
-   <Style TargetType="{x:Type primitives:SelectorItem}">
-        <Setter Property="Background"
-           Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
-
-        <Setter Property="IsTabStop"
-               Value="False" />
-
-        <Setter Property="Template">
-         <Setter.Value>
-            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-               <Border x:Name="_background"
-                       Background="{TemplateBinding Background}"
-                       BorderBrush="{TemplateBinding BorderBrush}"
-                       BorderThickness="{TemplateBinding BorderThickness}">
-                    <CheckBox Foreground="{TemplateBinding Foreground}"
-                              IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
-                              Content="{TemplateBinding Content}"
-                              ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                </Border>
-               <ControlTemplate.Triggers>
-                 <Trigger Property="IsMouseOver" Value="true">
-                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                </Trigger>
-                <Trigger Property="IsKeyboardFocusWithin" Value="true">
-                    <Setter TargetName="_background" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.HighlightTextBrushKey}}" />
-                </Trigger>
-            </ControlTemplate.Triggers>
-            </ControlTemplate>
-         </Setter.Value>
-      </Setter>
+
+    <!-- Button template -->
+    <ControlTemplate x:Key="buttonTemplate" TargetType="Button">
+        <Border Name="outerBorder" 
+                Background="{TemplateBinding Background}" 
+                BorderBrush="{TemplateBinding BorderBrush}"
+                BorderThickness="{TemplateBinding BorderThickness}">
+            <ContentPresenter />
+        </Border>
+    </ControlTemplate>
+
+   <Style x:Key="windowButtonBaseStyle" TargetType="Button">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Margin" Value="0,-1,0,0" />
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template" Value="{StaticResource buttonTemplate}" />
    </Style>
 
+    <!--Default Close button style-->
+   <Style x:Key="{ComponentResourceKey 
+                  TypeInTargetAssembly={x:Type primitives:WindowControl}, 
+                  ResourceId=DefaultCloseButtonStyle}"
+           TargetType="Button" 
+          BasedOn="{StaticResource windowButtonBaseStyle}">
+      <Setter Property="ToolTip" Value="Close" />
+      <Setter Property="Content" Value="{StaticResource close_normal}" />
+        <Style.Triggers>
+            <!-- Regular Window -->
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False">
+                <Setter Property="Content" Value="{StaticResource close_inactive}" />
+            </DataTrigger>
+            <Trigger Property="IsMouseOver" Value="True">
+            <Setter Property="Content" Value="{StaticResource close_hover}" />
+            </Trigger>
+            <Trigger Property="IsPressed" Value="True">
+            <Setter Property="Content" Value="{StaticResource close_pressed}" />
+            </Trigger>
+
+            <!-- NoResize (Close button with 2 rounded corners) -->
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_inactive}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=IsMouseOver}" Value="True" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_hover}" />
+            </MultiDataTrigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=IsPressed}" Value="True" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_rounded_pressed}" />
+            </MultiDataTrigger>
+
+            <!-- Tool Window -->
+            <Trigger Property="Name" Value="PART_ToolWindowCloseButton">
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_normal}" />
+            </Trigger>
+            <MultiDataTrigger>
+                <MultiDataTrigger.Conditions>
+                    <Condition Binding="{Binding RelativeSource={RelativeSource self},Path=Name}" Value="PART_ToolWindowCloseButton" />
+                    <Condition Binding="{Binding RelativeSource={RelativeSource TemplatedParent},Path=IsActive}" Value="False" />
+                </MultiDataTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_inactive}" />
+            </MultiDataTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
+                    <Condition Property="IsMouseOver" Value="True" />
+                </MultiTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_hover}" />
+            </MultiTrigger>
+            <MultiTrigger>
+                <MultiTrigger.Conditions>
+                    <Condition Property="Name" Value="PART_ToolWindowCloseButton" />
+                    <Condition Property="IsPressed" Value="True" />
+                </MultiTrigger.Conditions>
+            <Setter Property="Content" Value="{StaticResource close_toolwindow_pressed}" />
+            </MultiTrigger>
+
+        </Style.Triggers>
+    </Style>
+
+
+
+
+
+
+   <SolidColorBrush x:Key="Window_WindowBorderBrush" Color="#FF252C33" />
+
+   <conv:ColorBlendConverter x:Key="Window_WindowBackground_converter" BlendedColor="#FFA0A0A0" BlendedColorRatio="0.35" />
+   <SolidColorBrush x:Key="Window_WindowBackground" 
+                    Color="{Binding 
+                        Source={x:Static media:WindowColors.ColorizationColor}, 
+                        Converter={StaticResource Window_WindowBackground_converter}}" 
+                    Opacity="0.85"/>
+
+   <SolidColorBrush x:Key="Window_Background"  Color="White"/>
+
+   <conv:ColorBlendConverter x:Key="Window_WindowInactiveBackground_converter" BlendedColor="#FFF0F0F0" BlendedColorRatio="0.67" />
+   <SolidColorBrush x:Key="Window_WindowInactiveBackground" 
+                    Color="{Binding 
+                        Source={x:Static media:WindowColors.ColorizationColor}, 
+                        Converter={StaticResource Window_WindowInactiveBackground_converter}}" 
+                    Opacity="0.85"/>
+
+   <SolidColorBrush x:Key="Window_CaptionForeground" Color="Black"/>
+
+   <Thickness x:Key="Window_WindowBorderThickness">1</Thickness>
+
+   <!-- ========================================================================= -->
+   <!-- Used by ColorPicker and ColorCanvas                                       -->
+   <!-- ========================================================================= -->
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
index 1b523aae8..c9f66a9b9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png
new file mode 100644
index 000000000..3fe5c9193
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png
new file mode 100644
index 000000000..1b4619285
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png
new file mode 100644
index 000000000..d7fcb801d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png
new file mode 100644
index 000000000..e406e334f
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png
new file mode 100644
index 000000000..a8ef093a0
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png
new file mode 100644
index 000000000..fac35369d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png
new file mode 100644
index 000000000..7d8fede6d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png
new file mode 100644
index 000000000..0ee5dfbd9
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_rounded_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png
new file mode 100644
index 000000000..9a2987ec2
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png
new file mode 100644
index 000000000..4f9773535
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png
new file mode 100644
index 000000000..bf0669623
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png
new file mode 100644
index 000000000..1c3d9a5e3
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/close_toolwindow_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png
new file mode 100644
index 000000000..d9805399e
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_disabled.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png
new file mode 100644
index 000000000..4715f7d6b
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png
new file mode 100644
index 000000000..3755d81a6
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png
new file mode 100644
index 000000000..713a1a2f9
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png
new file mode 100644
index 000000000..ec5d431b8
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/maximize_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png
new file mode 100644
index 000000000..c4c0496c6
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png
new file mode 100644
index 000000000..204ea5cc3
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png
new file mode 100644
index 000000000..648703926
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png
new file mode 100644
index 000000000..3ab1ec5e8
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/minimize_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png
new file mode 100644
index 000000000..8a0859718
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/resize_grip.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png
new file mode 100644
index 000000000..1683f61d8
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_disabled.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png
new file mode 100644
index 000000000..9f1a27e55
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_hover.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png
new file mode 100644
index 000000000..da3f7787c
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_inactive.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png
new file mode 100644
index 000000000..595eb1fee
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_normal.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png
new file mode 100644
index 000000000..c94c7016d
Binary files /dev/null and b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/Generic/Images/restore_pressed.png differ
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
new file mode 100644
index 000000000..6d617a307
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero-based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
new file mode 100644
index 000000000..f0fd76152
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
@@ -0,0 +1,28 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+   <!-- 
+        This theme is not supported. All resource lookups will fall back on the content
+        of Generic.xaml (Aero based). This ResourceDictionary was inserted in order to 
+        hopfully resolve the following issues reported by the community:
+        Issue 19517
+        Issue 18971
+   -->
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
index d35041def..dc2d0db76 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeFormat.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
index 3eaffc0a5..b7baac60c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index e54707b7a..320dd54dd 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
@@ -22,6 +22,7 @@ This program is provided to you under the terms of the Microsoft Public
 using System.Windows.Input;
 using System.Windows.Controls.Primitives;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using System.Collections.Generic;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -466,7 +467,7 @@ private void OnKeyDown( object sender, KeyEventArgs e )
         if( KeyboardUtilities.IsKeyModifyingPopupState( e ) )
         {
           IsOpen = true;
-          // TimeListBox_Loaded() will Focus on ListBoxItem.
+          // TimeListBox_Loaded() will focus on ListBoxItem.
           e.Handled = true;
         }
       }
@@ -556,7 +557,7 @@ public event RoutedPropertyChangedEventHandler<object> ValueChanged
     private void ValidateTime( TimeSpan time )
     {
       if( time.TotalHours >= 24d )
-        throw new ArgumentException( "Time value cannot be greater or equal to 24 hours" );
+        throw new ArgumentException( "Time value cannot be greater than or equal to 24 hours." );
     }
 
     private void CloseTimePicker( bool isFocusOnTimePicker )
@@ -581,16 +582,17 @@ public IEnumerable GenerateTimeListItemsSource()
       }
 
       TimeSpan timeInterval = TimeInterval;
+      List<TimeItem> timeItemList = new List<TimeItem>();
 
       if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
       {
         while( time <= endTime )
         {
-          yield return this.CreateTimeItem( time );
+          timeItemList.Add( this.CreateTimeItem( time ) );
           time = time.Add( timeInterval );
         }
-        yield break;
       }
+      return timeItemList;
     }
 
     private TimeItem CreateTimeItem( TimeSpan time )
@@ -654,8 +656,8 @@ private TimeItem GetNearestTimeItem(TimeSpan time)
           }
         }
 
-        //They are all lower than the searched time. 
-        //Return the last one. (should also be the greater one)
+        //They are all less than the searched time. 
+        //Return the last one. (Should also be the greater one.)
         if( itemCount > 0 )
         {
           return _timeListBox.Items[ itemCount - 1 ] as TimeItem;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..dfbaccfd0
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,183 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:chrome="clr-namespace:Xceed.Wpf.Toolkit.Chromes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:InverseBoolConverter x:Key="InverseBoolConverter" />
+    <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" Margin="0,0,3,0" />
+    </DataTemplate>
+
+    <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ToggleButton">
+                    <Grid SnapsToDevicePixels="True">
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+
+                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                                    <Path x:Name="Arrow" Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+                                </Grid>
+                            </Grid>
+                        </chrome:ButtonChrome>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Fill" TargetName="Arrow" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ListBoxItem">
+                    <Border Name="Border" BorderThickness="1"  SnapsToDevicePixels="true">
+                        <ContentPresenter Margin="4" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+
+                        <!-- MouseOver Only -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="False" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFB8E0F3" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF26A0DA" />
+                        </MultiTrigger>
+
+                        <!-- Selected Only -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="False" />
+                                <Condition Property="IsSelected" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFC4E5F6" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF26A0DA" />
+                        </MultiTrigger>
+
+                        <!-- MouseOver + Selected -->
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsMouseOver" Value="True" />
+                                <Condition Property="IsSelected" Value="True" />
+                            </MultiTrigger.Conditions>
+                            <Setter TargetName="Border" Property="Background" Value="#FFD1E8FF" />
+                            <Setter TargetName="Border" Property="BorderBrush" Value="#FF66A7E8" />
+                        </MultiTrigger>
+
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+
+    <!-- =============================================================================== -->
+    <!-- TimePicker                                                                      -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:TimePicker}">
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:TimePicker}">
+                    <Border>
+                        <Grid>
+                            <Grid>
+                                <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="*" />
+                                    <ColumnDefinition Width="Auto" />
+                                </Grid.ColumnDefinitions>
+                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              TabIndex="{TemplateBinding TabIndex}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" 
+                                              TextAlignment="{TemplateBinding TextAlignment}"/>
+                                <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      Focusable="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                            </Grid>
+                            <Popup x:Name="PART_Popup"
+                            IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                                <Border BorderThickness="1" Background="{StaticResource PanelBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                                    <Grid>
+                                        <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                                    </Grid>
+                                </Border>
+                            </Popup>
+                        </Grid>
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsFocused" Value="True">
+                           <Setter TargetName="PART_TimeUpDown" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TimeUpDown}" />
+                        </Trigger>
+                  </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
index 3e4dda2d6..045df1bbd 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -28,7 +28,7 @@
    <conv:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
 
    <DataTemplate x:Key="DefaultWatermarkTemplate">
-      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" Margin="0,0,3,0" />
    </DataTemplate>
 
    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
@@ -129,12 +129,13 @@
                                               Foreground="{TemplateBinding Foreground}"
                                               ContextMenu="{TemplateBinding ContextMenu}"
                                               AllowSpin="{TemplateBinding AllowSpin}"
+                                              TabIndex="{TemplateBinding TabIndex}"
                                               Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
                                               FormatString="{TemplateBinding FormatString}"
                                               ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
                                               Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
                                               Watermark="{TemplateBinding Watermark}"
-                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" 
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}"
                                               TextAlignment="{TemplateBinding TextAlignment}"/>
                         <ToggleButton x:Name="_timePickerToggleButton"
                                       Grid.Column="1"
@@ -159,6 +160,11 @@
                      </Popup>
                   </Grid>
                </Border>
+                <ControlTemplate.Triggers>
+                   <Trigger Property="IsFocused" Value="True">
+                       <Setter TargetName="PART_TimeUpDown" Property="FocusManager.FocusedElement" Value="{Binding ElementName=PART_TimeUpDown}" />
+                   </Trigger>
+               </ControlTemplate.Triggers>
             </ControlTemplate>
          </Setter.Value>
       </Setter>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
index 959c90af1..8592f3e7d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
index 3125af7ed..f2f56c578 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index f0869d59b..2f8f99dba 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
index 25cdba8f9..145e2092e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/VisualStates.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index aa76b1dc7..e40726ae9 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..f41da9584
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,84 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit">
+
+
+    <DataTemplate x:Key="DefaultWatermarkTemplate">
+        <ContentControl Content="{Binding}" Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" Focusable="False" />
+    </DataTemplate>
+
+
+    <!-- =============================================================================== -->
+    <!-- WatermarkTextBox                                                                -->
+    <!-- =============================================================================== -->
+
+    <Style TargetType="{x:Type local:WatermarkTextBox}">
+        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="Padding" Value="3" />
+        <Setter Property="AllowDrop" Value="true" />
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+                    <Grid>
+
+                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="0" Background="{TemplateBinding Background}" />
+                        <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                        <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
+
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <MultiTrigger>
+                            <MultiTrigger.Conditions>
+                                <Condition Property="IsFocused" Value="False" />
+                                <Condition Property="Text" Value="" />
+                            </MultiTrigger.Conditions>
+                            <MultiTrigger.Setters>
+                                <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                            </MultiTrigger.Setters>
+                        </MultiTrigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlMouseOverBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlSelectedBorderKey}}" />
+                        </Trigger>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
index 7540a0703..c811c55d3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
index bba1cd048..dd67204d3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -1,24 +1,25 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Interop;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -394,6 +395,11 @@ private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
 
       if( CurrentPage != null )
       {
+        var eventArgs = new CancelRoutedEventArgs( NextEvent );
+        this.RaiseEvent( eventArgs );
+        if( eventArgs.Cancel )
+          return;
+
         //check next page
         if( CurrentPage.NextPage != null )
           nextPage = CurrentPage.NextPage;
@@ -430,6 +436,11 @@ private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e
 
       if( CurrentPage != null )
       {
+        var eventArgs = new CancelRoutedEventArgs( PreviousEvent );
+        this.RaiseEvent( eventArgs );
+        if( eventArgs.Cancel )
+          return;
+
         //check previous page
         if( CurrentPage.PreviousPage != null )
           previousPage = CurrentPage.PreviousPage;
@@ -464,6 +475,8 @@ private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventA
 
     #region Events
 
+    #region Cancel Event
+
     public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Cancel
     {
@@ -477,6 +490,10 @@ public event RoutedEventHandler Cancel
       }
     }
 
+    #endregion //Cancel Event
+
+    #region PageChanged Event
+
     public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler PageChanged
     {
@@ -490,6 +507,10 @@ public event RoutedEventHandler PageChanged
       }
     }
 
+    #endregion //PageChanged Event
+
+    #region Finish Event
+
     public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Finish
     {
@@ -503,6 +524,10 @@ public event RoutedEventHandler Finish
       }
     }
 
+    #endregion //Finish Event
+
+    #region Help Event
+
     public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
     public event RoutedEventHandler Help
     {
@@ -516,6 +541,60 @@ public event RoutedEventHandler Help
       }
     }
 
+    #endregion //Help Event
+
+    #region Next Event
+
+    public delegate void NextRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+    /// <summary>
+    /// Identifies the Next routed event.
+    /// </summary>
+    public static readonly RoutedEvent NextEvent = EventManager.RegisterRoutedEvent( "Next", RoutingStrategy.Bubble, typeof( NextRoutedEventHandler ), typeof( Wizard ) );
+    /// <summary>
+    /// Raised when WizardCommands.NextPage command is executed.
+    /// This cancellable event can prevent the command execution from continuing.
+    /// </summary>
+    public event NextRoutedEventHandler Next
+    {
+      add
+      {
+        AddHandler( NextEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( NextEvent, value );
+      }
+    }
+
+    #endregion //Next Event
+
+    #region Previous Event
+
+    public delegate void PreviousRoutedEventHandler( object sender, CancelRoutedEventArgs e );
+
+    /// <summary>
+    /// Identifies the Previous routed event.
+    /// </summary>
+    public static readonly RoutedEvent PreviousEvent = EventManager.RegisterRoutedEvent( "Previous", RoutingStrategy.Bubble, typeof( PreviousRoutedEventHandler ), typeof( Wizard ) );
+    /// <summary>
+    /// Raised when WizardCommands.PreviousPage command is executed.
+    /// This cancellable event can prevent the command execution from continuing.
+    /// </summary>
+    public event PreviousRoutedEventHandler Previous
+    {
+      add
+      {
+        AddHandler( PreviousEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PreviousEvent, value );
+      }
+    }
+
+    #endregion //Previous Event
+
     #endregion //Events
 
     #region Methods
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
index cc7f6f4cc..06931d6f6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows.Input;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index cc42f4d07..8bea018c3 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -1,22 +1,23 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -280,6 +281,63 @@ static WizardPage()
       DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
     }
 
+    public WizardPage()
+    {
+      this.Loaded += new RoutedEventHandler( WizardPage_Loaded );
+      this.Unloaded += new RoutedEventHandler( WizardPage_Unloaded );
+    }
+
+    void WizardPage_Unloaded( object sender, RoutedEventArgs e )
+    {
+      base.RaiseEvent( new RoutedEventArgs( WizardPage.LeaveEvent, this ) );
+    }
+
+    void WizardPage_Loaded( object sender, RoutedEventArgs e )
+    {
+      if( this.IsVisible )
+      {
+        base.RaiseEvent( new RoutedEventArgs( WizardPage.EnterEvent, this ) );
+      }
+    }
+
     #endregion //Constructors
+
+    #region Events
+
+    #region Enter Event
+
+    public static readonly RoutedEvent EnterEvent = EventManager.RegisterRoutedEvent( "Enter", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
+    public event RoutedEventHandler Enter
+    {
+      add
+      {
+        AddHandler( EnterEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( EnterEvent, value );
+      }
+    }
+
+    #endregion //Enter Event
+
+    #region Leave Event
+
+    public static readonly RoutedEvent LeaveEvent = EventManager.RegisterRoutedEvent( "Leave", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( WizardPage ) );
+    public event RoutedEventHandler Leave
+    {
+      add
+      {
+        AddHandler( LeaveEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( LeaveEvent, value );
+      }
+    }
+
+    #endregion //Leave Event
+
+    #endregion  //Events
   }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
index 771946ebd..6351252f0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
index e124c2398..0a9d7668e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..08654b700
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,211 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit"
+                    xmlns:themes="clr-namespace:Xceed.Wpf.Toolkit.Themes"
+                    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters">
+
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="../../Themes/Aero2/Common.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+
+    <conv:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
+
+    <Style TargetType="{x:Type local:Wizard}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="ItemsPanel">
+            <Setter.Value>
+                <ItemsPanelTemplate>
+                    <Grid />
+                </ItemsPanelTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Wizard}">
+                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid Background="{TemplateBinding Background}">
+                            <Grid.RowDefinitions>
+                                <RowDefinition Height="*" />
+                                <RowDefinition Height="Auto" />
+                            </Grid.RowDefinitions>
+
+                            <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                            <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,1,0,0" Padding="7">
+                                <StackPanel Background="{TemplateBinding Background}">
+                                    <Grid Margin="{TemplateBinding Padding}">
+                                        <Grid.ColumnDefinitions>
+                                            <ColumnDefinition Width="Auto" />
+                                            <ColumnDefinition Width="*" />
+                                        </Grid.ColumnDefinitions>
+                                        <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                            <Button.Visibility>
+                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                                </MultiBinding>
+                                            </Button.Visibility>
+                                        </Button>
+                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                            <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                            <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                                <Button.Visibility>
+                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                                    </MultiBinding>
+                                                </Button.Visibility>
+                                            </Button>
+                                        </StackPanel>
+                                    </Grid>
+                                </StackPanel>
+                            </Border>
+                        </Grid>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+        </Border>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Grid Background="{TemplateBinding Background}">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+                </Grid>
+            </Border>
+            <Grid Column="1" Margin="14">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+            </Grid>
+        </Grid>
+    </ControlTemplate>
+
+    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+
+            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <StackPanel>
+                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+                </StackPanel>
+                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+            </Grid>
+
+            <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+                <Grid Background="{TemplateBinding Background}">
+                    <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+                </Grid>
+            </Border>
+        </Grid>
+    </ControlTemplate>
+
+    <Style TargetType="{x:Type local:WizardPage}">
+        <Style.Triggers>
+            <Trigger Property="PageType" Value="Blank">
+                <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+            </Trigger>
+            <Trigger Property="PageType" Value="Exterior">
+                <Setter Property="Background" Value="White" />
+                <Setter Property="BorderThickness" Value="0" />
+                <Setter Property="ExteriorPanelBackground" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+            </Trigger>
+            <Trigger Property="PageType" Value="Interior">
+                <Setter Property="Background" Value="{StaticResource PanelBackgroundBrush}" />
+                <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+                <Setter Property="BorderThickness" Value="0,1,0,0" />
+                <Setter Property="HeaderBackground" Value="White" />
+                <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
index 256c6ad0e..4786e5f67 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
index 3df2aed15..b92cd3e3f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.csproj
@@ -49,30 +49,62 @@
     <Reference Include="WPFToolkit, Version=3.5.40128.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
   </ItemGroup>
   <ItemGroup>
+    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="BusyIndicator\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ButtonSpinner\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ButtonSpinner\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CalculatorUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CalculatorUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Calculator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Calculator\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="CheckComboBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CheckListBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="CheckListBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ChildWindow\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ChildWindow\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Chromes\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Chromes\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -81,14 +113,26 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="CollectionControl\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="CollectionControl\Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="ColorCanvas\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ColorCanvas\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="ColorPicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="ColorPicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -97,14 +141,42 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Core\Themes\Aero2\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Aero2\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Generic\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Core\Themes\Generic\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DateTimePicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DateTimeUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DateTimeUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="DropDownButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="DropDownButton\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -113,14 +185,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MessageBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MessageBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="MultiLineTextEditor\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="NumericUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="NumericUpDown\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -129,6 +213,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="PropertyGrid\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="PropertyGrid\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -137,6 +225,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="SplitButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="SplitButton\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -145,6 +237,26 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Buttons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -153,6 +265,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\classic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Themes\Generic.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -173,18 +289,50 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Themes\luna.homestead.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.metallic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\royale.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="TimePicker\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="WatermarkTextBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="WatermarkTextBox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Wizard\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Wizard\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Zoombox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Zoombox\Themes\Generic.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -215,7 +363,15 @@
     <Compile Include="CollectionControl\Implementation\CollectionControlDialog.xaml.cs">
       <DependentUpon>CollectionControlDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="CollectionControl\Implementation\Converters\NewItemTypesComboBoxConverter.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemAddingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemDeletingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemEventArgs.cs" />
     <Compile Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.cs" />
+    <Compile Include="Core\CancelRoutedEventArgs.cs" />
+    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
+    <Compile Include="Core\Converters\WindowContentBorderMarginConverter.cs" />
+    <Compile Include="Core\Converters\WindowControlBackgroundConverter.cs" />
     <Compile Include="Core\Input\IValidateInput.cs" />
     <Compile Include="Core\Input\InputValidationErrorEventArgs.cs" />
     <Compile Include="Core\Media\Animation\AnimationRate.cs" />
@@ -225,6 +381,7 @@
     <Compile Include="Core\Media\Animation\IterativeEquationConverter.cs" />
     <Compile Include="Core\Media\Animation\PennerEquation.cs" />
     <Compile Include="Core\Media\Animation\PennerEquations.cs" />
+    <Compile Include="Core\Media\WindowColors.cs" />
     <Compile Include="Core\Primitives\CachedTextInfo.cs" />
     <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
     <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
@@ -244,8 +401,18 @@
     <Compile Include="Core\Primitives\HsvColor.cs" />
     <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
     <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
+    <Compile Include="Core\Primitives\MouseWheelActiveTriggerEnum.cs" />
+    <Compile Include="Core\Primitives\WindowContainer.cs" />
+    <Compile Include="Core\Primitives\WindowControl.cs" />
+    <Compile Include="Core\Utilities\FontUtilities.cs" />
+    <Compile Include="Core\Utilities\GeneralUtilities.cs" />
     <Compile Include="Core\Utilities\KeyboardUtilities.cs" />
+    <Compile Include="Core\Utilities\ListUtilities.cs" />
+    <Compile Include="Core\Utilities\PropertyChangedExt.cs" />
     <Compile Include="Core\Utilities\RoutedEventHelper.cs" />
+    <Compile Include="Core\Utilities\WeakEventListener.cs" />
+    <Compile Include="Core\Utilities\WindowUtilities.cs" />
+    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
     <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
     <Compile Include="Panels\AnimatorConverter.cs" />
     <Compile Include="Panels\Animators.cs" />
@@ -280,7 +447,6 @@
     <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
     <Compile Include="Core\Utilities\DoubleHelper.cs" />
     <Compile Include="Core\Utilities\EllipseHelper.cs" />
-    <Compile Include="Core\Utilities\NotifyPropertyChangedHelper.cs" />
     <Compile Include="Core\Utilities\PointHelper.cs" />
     <Compile Include="Core\Utilities\RectHelper.cs" />
     <Compile Include="Core\Utilities\ReflectionHelper.cs" />
@@ -309,7 +475,7 @@
     <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
     <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
     <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
-    <Compile Include="Magnifier\Implementation\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
+    <Compile Include="Core\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
     <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
     <Compile Include="Magnifier\Implementation\Magnifier.cs" />
     <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
@@ -343,9 +509,20 @@
     <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\NewItemTypesAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
     <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\CommonPropertyExceptionValidationRule.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ListConverter.cs" />
     <Compile Include="PropertyGrid\Implementation\Converters\SelectedObjectConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\EditorTimeSpanConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\CustomPropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorTemplateDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\PropertyDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionBaseCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\FilterInfo.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelperBase.cs" />
     <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinitionBase.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.xaml.cs">
@@ -354,7 +531,6 @@
     <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\EditorDefinitionCollection.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
@@ -367,15 +543,18 @@
     <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
     <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
     <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\IPropertyParent.cs" />
+    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionCollection.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
-    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemsControl.cs" />
+    <Compile Include="PropertyGrid\Implementation\ContainerHelperBase.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemBase.cs" />
     <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
     <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelper.cs" />
+    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
     <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
     <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.xaml.cs">
       <DependentUpon>RichTextBoxFormatBar.xaml</DependentUpon>
@@ -390,6 +569,7 @@
     <Compile Include="Core\Primitives\UpDownBase.cs" />
     <Compile Include="SplitButton\Implementation\SplitButton.cs" />
     <Compile Include="Core\Themes\ResourceKeys.cs" />
+    <Compile Include="StylableWindow\Implementation\Converters\StylableWindowClippingBorderConverter.cs" />
     <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
     <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
     <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
@@ -494,6 +674,37 @@
   <ItemGroup>
     <Resource Include="CollectionControl\Images\Delete16.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\close_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_pressed.png" />
+    <Resource Include="Themes\Generic\Images\maximize_disabled.png" />
+    <Resource Include="Themes\Generic\Images\maximize_hover.png" />
+    <Resource Include="Themes\Generic\Images\maximize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\maximize_normal.png" />
+    <Resource Include="Themes\Generic\Images\maximize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\minimize_hover.png" />
+    <Resource Include="Themes\Generic\Images\minimize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\minimize_normal.png" />
+    <Resource Include="Themes\Generic\Images\minimize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\resize_grip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\restore_disabled.png" />
+    <Resource Include="Themes\Generic\Images\restore_hover.png" />
+    <Resource Include="Themes\Generic\Images\restore_inactive.png" />
+    <Resource Include="Themes\Generic\Images\restore_normal.png" />
+    <Resource Include="Themes\Generic\Images\restore_pressed.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
   </PropertyGroup>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
new file mode 100644
index 000000000..a3a78c969
--- /dev/null
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
@@ -0,0 +1,598 @@
+﻿<!--***********************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2007-2013 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Public
+   License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  **********************************************************************************-->
+
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.Core.Converters"
+    xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.Zoombox">
+
+    <conv:RoundedValueConverter x:Key="RoundedValueConverter" Precision="2" />
+    <conv:VisibilityToBoolConverter x:Key="TrueIfVisibleConverter"
+      Inverted="False" Not="False" />
+    <conv:VisibilityToBoolConverter x:Key="TrueIfNotVisibleConverter"
+      Inverted="False" Not="True" />
+    <conv:VisibilityToBoolConverter x:Key="VisibleIfTrueConverter"
+      Inverted="True" Not="False" />
+    <conv:VisibilityToBoolConverter x:Key="VisibleIfNotTrueConverter"
+      Inverted="True" Not="True" />
+
+    <SolidColorBrush x:Key="GlyphBrush" Color="white" />
+
+    <Style x:Key="TransparentButton" TargetType="{x:Type ButtonBase}"
+      BasedOn="{x:Null}">
+        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+        <Setter Property="Background" Value="#333333" />
+        <Setter Property="Foreground" Value="#cccccc" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ButtonBase}">
+                    <Grid Background="Transparent" Cursor="Hand">
+                        <Rectangle Fill="{TemplateBinding Background}"
+                Stroke="{TemplateBinding Foreground}" RadiusX="3" RadiusY="3"
+                x:Name="BackgroundTextBoxRectangle" Opacity="0" />
+                        <ContentPresenter />
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsEnabled" Value="False">
+                            <Setter Property="Opacity" Value="0.4" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                        </Trigger>
+                        <Trigger Property="IsKeyboardFocusWithin" Value="True">
+                            <Setter TargetName="BackgroundTextBoxRectangle" Property="Opacity"
+                  Value="1" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style x:Key="ViewFinderToggleButtonStyle" BasedOn="{StaticResource TransparentButton}" TargetType="{x:Type ToggleButton}">
+        <Setter Property="Visibility" Value="Visible" />
+        <Style.Triggers>
+            <DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:Zoombox}}, Path=ViewFinderVisibility}" Value="Hidden">
+                <Setter Property="Visibility" Value="Collapsed" />
+            </DataTrigger>
+        </Style.Triggers>
+    </Style>
+
+    <DrawingImage x:Key="ShowViewFinderGlyph" >
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,11.533,0.664" />
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FF000000" Geometry="M8.823,9.895 
+              L12.440,13.460 10.784,15.092 15.347,15.092 15.347,15.125 
+              9.651,15.125 11.306,13.493 8.239,10.470 8.823,9.895 z 
+              M15.347,9.511 L15.347,10.595 14.842,11.093 14.292,10.551
+              15.347,9.511 z M0,9.481 L1.133,10.598 1.133,15.092 
+              5.694,15.092 5.727,15.125 0,15.125 0,9.481 z M14.842,3.963 
+              L15.347,4.461 15.347,5.611 14.258,4.538 14.842,3.963 z 
+              M2.793,3.952 L6.410,7.517 2.793,11.082 2.243,10.540 
+              5.276,7.551 2.209,4.527 2.793,3.952 z M9.653,0 L10.821,0 
+              12.429,1.585 8.812,5.150 8.262,4.608 11.296,1.618 9.653,0 z
+              M0,0 L1.133,0 1.133,4.504 0,5.621 0,0 z"/>
+                </DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.048,1.182"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#4B5F5F5F" Geometry="M0,0 L5.703,0 
+              4.061,1.618 7.678,5.183 11.295,1.618 9.653,0 15.347,0 15.347,5.611
+              13.704,3.996 10.091,7.561 13.708,11.126 15.347,9.511 15.347,15.125 
+              9.651,15.125 11.306,13.493 7.689,9.928 4.071,13.493 5.727,15.125 
+              0,15.125 0,9.480 1.659,11.115 5.276,7.551 1.659,3.986 0,5.621 0,0 z"/>
+                </DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="0.707,0.707,-0.707,0.707,12.186,1.538"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.867,9.820 L7.334,10.280 
+              4.072,13.494 5.727,15.126 0,15.126 0,15.016 4.906,15.016 3.250,13.384
+              6.867,9.820 z M15.347,9.512 L15.347,15.126 9.651,15.126 9.762,15.016
+              14.525,15.016 14.525,10.322 15.347,9.512 z M0,9.481 L1.193 ,10.657 
+              0.837,11.007 0,10.182 0,9.481 z M12.887,3.888 L13.353,4.347 
+              10.091,7.56 13.242,10.667 12.887,11.018 9.270,7.453 12.887,3.888 z
+              M0.837,3.878 L1.303,4.337 0,5.621 0,4.703 0.837,3.878 z M14.525,0 
+              L15.347,0 15.347,5.612 14.525,4.802 14.525,0 z M4.772,0 L5.703,0
+              4.061,1.617 7.212,4.724 6.857,5.075 3.239,1.511 4.772,0 z"/>
+                </DrawingGroup>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="FillToBoundsGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 218.138,210.145L 255.599,210.145L
+              255.599,246.628L 218.138,246.628L 218.138,210.145 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.378,215.741L 249.378,215.743L 249.383,215.743L 
+              249.383,219.159L 249.378,219.159L 249.378,224.598L 245.962,224.598L 
+              245.962,219.159L 240.525,219.159L 240.525,215.743L 245.962,215.743L 
+              245.962,215.741L 249.378,215.741 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 249.383,240.726L 249.381,240.726L 249.381,240.73L 
+              245.965,240.73L 245.965,240.726L 240.526,240.726L 240.526,237.31L 
+              245.965,237.31L 245.965,231.873L 249.381,231.873L 249.381,237.31L 
+              249.383,237.31L 249.383,240.726 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 247.539,220.321L 239.801,228.059L 247.539,235.796L 
+              244.962,238.373L 237.224,230.635L 229.487,238.373L 226.91,235.796L 
+              234.648,228.059L 226.91,220.321L 229.487,217.744L 237.224,225.482L 
+              244.962,217.744L 247.539,220.321 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.879,240.73L 224.879,240.729L 224.874,240.729L 
+              224.874,237.312L 224.879,237.312L 224.879,231.873L 228.295,231.873L 
+              228.295,237.312L 233.732,237.312L 233.732,240.729L 228.295,240.729L 
+              228.295,240.73L 224.879,240.73 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 224.874,215.746L 224.876,215.746L 224.876,215.741L 
+              228.292,215.741L 228.292,215.746L 233.731,215.746L 233.731,219.162L 
+              228.292,219.162L 228.292,224.598L 224.876,224.598L 224.876,219.162L 
+              224.874,219.162L 224.874,215.746 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="FitContentGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 267.334,210.477L 304.795,210.477L 
+              304.795,246.96L 267.334,246.96L 267.334,210.477 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.574,216.073L 298.574,216.075L 298.579,216.075L 
+              298.579,219.491L 298.574,219.491L 298.574,224.93L 295.158,224.93L 
+              295.158,219.491L 289.721,219.491L 289.721,216.075L 295.158,216.075L 
+              295.158,216.073L 298.574,216.073 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 298.579,241.058L 298.577,241.058L 298.577,241.062L 
+              295.161,241.062L 295.161,241.058L 289.722,241.058L 289.722,237.642L 
+              295.161,237.642L 295.161,232.205L 298.577,232.205L 298.577,237.642L 
+              298.579,237.642L 298.579,241.058 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.075,241.062L 274.075,241.061L 274.07,241.061L 
+              274.07,237.644L 274.075,237.644L 274.075,232.205L 277.491,232.205L 
+              277.491,237.644L 282.928,237.644L 282.928,241.061L 277.491,241.061L 
+              277.491,241.062L 274.075,241.062 Z"/>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 274.07,216.078L 274.072,216.078L 274.072,216.073L 
+              277.488,216.073L 277.488,216.078L 282.927,216.078L 282.927,219.494L 
+              277.488,219.494L 277.488,224.93L 274.072,224.93L 274.072,219.494L 
+              274.07,219.494L 274.07,216.078 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="CenterGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 315.334,209.944L 352.795,209.944L 
+              352.795,246.427L 315.334,246.427L 315.334,209.944 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 328.878,223.652L 338.19,223.652C 338.27,223.652 
+              338.334,223.716 338.334,223.796L 338.334,233.108C 338.334,233.188 
+              338.27,233.252 338.19,233.252L 328.878,233.252C 328.799,233.252 
+              328.734,233.188 328.734,233.108L 328.734,223.796C 328.734,223.716 
+              328.799,223.652 328.878,223.652 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="RefocusGlyph" >
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup>
+                    <DrawingGroup.Transform>
+                        <MatrixTransform Matrix="1,0,0,1,0.667,1.667"/>
+                    </DrawingGroup.Transform>
+                    <GeometryDrawing Brush="#FFFFFFFF" Geometry="M6.624,0 C10.281,0 
+              13.247,2.836 13.247,6.334 13.247,7.176 13.075,7.980 12.734,8.703
+              L14.666,10.550 14.666,10.631 8.989,10.631 8.989,5.202 9.072,5.202
+              10.971,7.018 C11.095,6.810 11.116,6.573 11.116,6.331 11.116,3.959
+              9.104,2.034 6.622,2.034 4.139,2.034 2.127,3.959 2.127,6.331
+              2.127,8.575 3.925,10.417 6.224,10.552 L8.220,12.461 C7.712,12.602
+              7.176,12.667 6.624,12.667 2.966,12.667 0,9.831 0,6.334 0,2.836
+              2.966,0 6.624,0 z"/>
+                </DrawingGroup>
+                <GeometryDrawing Brush="#00FFFFFF">
+                    <GeometryDrawing.Geometry>
+                        <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,16,16"/>
+                    </GeometryDrawing.Geometry>
+                </GeometryDrawing>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="HomeGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Geometry="F1 M 414.001,209.411L 451.462,209.411L 
+              451.462,245.893L 414.001,245.893L 414.001,209.411 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1.2" LineJoin="Round" Brush="transparent"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 442.009,240.438C 442.009,240.534 441.886,240.612 
+              441.735,240.612L 423.992,240.612C 423.841,240.612 423.718,240.534 
+              423.718,240.438L 423.718,229.595L 418.991,229.595C 418.874,229.479 
+              418.874,229.289 418.991,229.173L 432.652,215.511C 432.769,215.395 
+              432.958,215.395 433.075,215.511L 446.736,229.173C 446.853,229.289 
+              446.853,229.479 446.736,229.595L 442.009,229.595L 442.009,240.438 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="PreviousGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="#00000000" Geometry="F1 M 8.47772,268.99L 
+              75.1444,268.99L 75.1444,335.657L 8.47772,335.657L 8.47772,268.99 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round" Brush="Transparent"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}" Geometry="F1 M 
+              57.2513,286.303L 57.2513,318.344L 26.3707,302.323L 57.2513,286.303 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="NextGlyph">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="#00000000" Geometry="F1 M 75.1444,415.886L 
+              8.47772,415.886L 8.47772,349.219L 75.1444,349.219L 75.1444,415.886 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round" Brush="#00FFFFFF"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 26.3708,398.573L 26.3708,366.532L 57.2514,382.553L 
+              26.3708,398.573 Z">
+                        <GeometryDrawing.Pen>
+                            <Pen Thickness="1" LineJoin="Round"
+                  Brush="{StaticResource GlyphBrush}"/>
+                        </GeometryDrawing.Pen>
+                    </GeometryDrawing>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <DrawingImage x:Key="CloseXDrawingImage">
+        <DrawingImage.Drawing>
+            <DrawingGroup>
+                <DrawingGroup.Children>
+                    <GeometryDrawing Brush="{StaticResource GlyphBrush}"
+              Geometry="F1 M 470.57,422.952C 470.414,423.109 470.161,423.109 
+              470.005,422.952L 451.714,404.662C 451.558,404.506 451.558,404.252 
+              451.714,404.096L 489.144,366.667L 451.714,329.237C 451.558,329.081 
+              451.558,328.828 451.714,328.671L 470.005,310.381C 470.161,310.225 
+              470.414,310.225 470.57,310.381L 508,347.81L 545.43,310.381C 
+              545.586,310.225 545.839,310.225 545.995,310.381L 564.286,328.671C 
+              564.442,328.828 564.442,329.081 564.286,329.237L 526.856,366.667L 
+              564.286,404.096C 564.442,404.252 564.442,404.506 564.286,404.662L 
+              545.995,422.952C 545.839,423.109 545.586,423.109 545.43,422.952L 
+              508,385.523L 470.57,422.952 Z"/>
+                </DrawingGroup.Children>
+            </DrawingGroup>
+        </DrawingImage.Drawing>
+    </DrawingImage>
+
+    <Style x:Key="{x:Type local:Zoombox}" TargetType="{x:Type local:Zoombox}">
+        <Setter Property="Background" Value="Transparent" />
+        <Setter Property="Foreground" Value="White" />
+        <Setter Property="PanDistance" Value="5.0" />
+        <Setter Property="ZoomOrigin" Value="0.5,0.5" />
+        <Setter Property="ZoomPercentage" Value="5.0" />
+        <Setter Property="DragModifiers" Value="Ctrl,Exact" />
+        <Setter Property="DragOnPreview" Value="False" />
+        <Setter Property="ZoomModifiers" Value="Shift,Exact" />
+        <Setter Property="ZoomOnPreview" Value="True" />
+        <Setter Property="RelativeZoomModifiers" Value="Ctrl,Alt,Exact" />
+        <Setter Property="ZoomToSelectionModifiers" Value="Alt,Exact" />
+        <Setter Property="NavigateOnPreview" Value="False" />
+        <Setter Property="ViewFinderVisibility" Value="Collapsed" />
+        <Setter Property="MinScale" Value="0.01" />
+        <Setter Property="MaxScale" Value="100.0" />
+        <Setter Property="Focusable" Value="False" />
+        <Setter Property="IsTabStop" Value="False" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type local:Zoombox}">
+                    <ControlTemplate.Resources>
+                        <SolidColorBrush x:Key="SelectionBrush" Color="Transparent" />
+                        <Pen x:Key="SelectionPen" Thickness="2.0" Brush="#7F3F3F3F" />
+                        <Pen x:Key="ViewportPen" Thickness="1.0" Brush="Red" />
+                        <InputBindingCollection x:Key="InputBindings">
+                            <KeyBinding Command="local:Zoombox.ZoomOut" Key="Left"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomOut" Key="Up"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomIn" Key="Right"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.ZoomIn" Key="Down"
+                  Modifiers="Control" />
+                            <KeyBinding Command="local:Zoombox.PanLeft" Key="Left"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanUp" Key="Up"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanRight" Key="Right"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.PanDown" Key="Down"
+                  Modifiers="Shift+Control" />
+                            <KeyBinding Command="local:Zoombox.Forward" Key="BrowserForward" />
+                            <KeyBinding Command="local:Zoombox.Back" Key="BrowserBack" />
+                            <KeyBinding Command="local:Zoombox.Back" Key="Back" />
+                        </InputBindingCollection>
+                    </ControlTemplate.Resources>
+                    <Grid Name="BackgroundGrid" Background="{TemplateBinding Background}">
+                        <ContentPresenter />
+                        <Border Name="ViewFinder" RenderTransformOrigin="1,1"
+                Background="#b0666666" BorderBrush="{TemplateBinding Foreground}"
+                BorderThickness="2" Opacity="0" Width="200" Height="190"
+                HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10"
+                CornerRadius="0" >
+                            <Border.RenderTransform>
+                                <TransformGroup>
+                                    <ScaleTransform x:Name="LayoutScaleTransform"
+                      ScaleX="0" ScaleY="0"/>
+                                </TransformGroup>
+                            </Border.RenderTransform>
+                            <Grid Margin="4">
+                                <Grid.RowDefinitions>
+                                    <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="*"/>
+                                    <RowDefinition Height="Auto"/>
+                                </Grid.RowDefinitions>
+                                <StackPanel Orientation="Horizontal" Margin="0,0,0,3">
+                                    <Button x:Name="BackButton" Command="local:Zoombox.Back"
+                      ToolTip="Go Back" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource PreviousGlyph}" />
+                                    </Button>
+                                    <Button x:Name="ForwardButton" Command="local:Zoombox.Forward"
+                      ToolTip="Go Forward" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource NextGlyph}"  />
+                                    </Button>
+                                    <Button x:Name="HomeButton" Command="local:Zoombox.Home"
+                      ToolTip="Go Home" Width="20px" Height="20px"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource HomeGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="FitButton" Command="local:Zoombox.Fit"
+                      ToolTip="Fit Content within Bounds" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource FitContentGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="FillButton" Command="local:Zoombox.Fill"
+                      ToolTip="Fill Bounds with Content" Width="20px" Height="20px"
+                      Margin="2,0"  Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource FillToBoundsGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="CenterButton" Command="local:Zoombox.Center"
+                      ToolTip="Center Content" Width="20px" Height="20px"
+                      Margin="2,0" Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource CenterGlyph}" Margin="2"/>
+                                    </Button>
+                                    <Button x:Name="RefocusButton" Command="local:Zoombox.Refocus"
+                      Visibility="Collapsed" ToolTip="Refocus View"
+                      Width="20px" Height="20px" Margin="2,0"
+                      Style="{StaticResource TransparentButton}">
+                                        <Image Source="{StaticResource RefocusGlyph}" Margin="2"/>
+                                    </Button>
+                                </StackPanel>
+                                <ToggleButton x:Name="ToggleViewFinderButton"
+                    ToolTip="Hide View Finder" Height="13" Width="13"
+                    Margin="0,2,0,0" HorizontalAlignment="Right"
+                    VerticalAlignment="Top"
+                    Style="{StaticResource TransparentButton}" Foreground="White"
+                    IsChecked="{Binding ElementName=ShowViewFinder, Path=IsChecked}" >
+                                    <Image Source="{StaticResource CloseXDrawingImage}" Margin="2" />
+                                </ToggleButton>
+                                <Border Grid.Row="1" BorderBrush="{StaticResource GlyphBrush}"
+                    BorderThickness="2" Background="#80FFFFFF" />
+                                <local:ZoomboxViewFinderDisplay Grid.Row="1" Name="ViewFinderDisplay"
+                    ClipToBounds="True" Background="#C0FFFFFF" Margin="2" 
+                    ShadowBrush="#80FFFFFF" ViewportBrush="Transparent"
+                    ViewportPen="{StaticResource ViewportPen}" />
+                            </Grid>
+                        </Border>
+                        <ToggleButton Name="ShowViewFinder" IsTabStop="False"
+                ToolTip="Show View Finder" HorizontalAlignment="Right"
+                VerticalAlignment="Bottom" Margin="5" Height="22" Width="22"
+                FocusVisualStyle="{x:Null}"
+                Style="{StaticResource ViewFinderToggleButtonStyle}"
+                Foreground="Transparent" Background="Transparent"
+                IsChecked="{Binding Path=ViewFinderVisibility, 
+                    Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent},
+                    Converter={StaticResource TrueIfVisibleConverter}}">
+                            <Grid Name="ShowViewFinderGlyph" Opacity="0">
+                                <Image x:Name="ShowViewFinderGlyphImage" 
+                    Source="{StaticResource ShowViewFinderGlyph}" />
+                            </Grid>
+                        </ToggleButton>
+                    </Grid>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="EffectiveViewStackMode" Value="Manual">
+                            <Setter TargetName="RefocusButton" Property="Visibility" Value="Visible" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                        FillBehavior="HoldEnd" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation Storyboard.TargetName="ShowViewFinderGlyph"
+                        Storyboard.TargetProperty="Opacity"
+                        DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                        FillBehavior="HoldEnd" />
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
+                        </Trigger>
+                        <Trigger Property="IsChecked" Value="False" SourceName="ShowViewFinder">
+                            <Setter Property="Focusable" Value="False" TargetName="BackButton" />
+                            <Setter Property="Focusable" Value="False"
+                  TargetName="ForwardButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="HomeButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="FitButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="FillButton" />
+                            <Setter Property="Focusable" Value="False" TargetName="CenterButton" />
+                            <Setter Property="Focusable" Value="False"
+                  TargetName="ToggleViewFinderButton" />
+                        </Trigger>
+                        <EventTrigger RoutedEvent="ToggleButton.Checked"
+                SourceName="ShowViewFinder">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="1"
+                      KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                        <EventTrigger RoutedEvent="ToggleButton.Unchecked"
+                SourceName="ShowViewFinder">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleY)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimationUsingKeyFrames BeginTime="00:00:00"
+                      Storyboard.TargetProperty="(ScaleTransform.ScaleX)"
+                      Storyboard.TargetName="LayoutScaleTransform"
+                      AccelerationRatio="1">
+                                        <SplineDoubleKeyFrame  KeySpline="0.5,0.5,0.5,0.5" Value="0"
+                        KeyTime="00:00:00.3"/>
+                                    </DoubleAnimationUsingKeyFrames>
+                                    <DoubleAnimation Storyboard.TargetName="ViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="1" To="0"
+                      FillBehavior="HoldEnd" />
+                                    <DoubleAnimation Storyboard.TargetName="ShowViewFinder"
+                      Storyboard.TargetProperty="Opacity"
+                      DecelerationRatio="1"  Duration="0:0:0.3" From="0" To="1"
+                      FillBehavior="HoldEnd" />
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <!-- NOTE:  Order matters!
+          These triggers should be ordered according to the KeyModifiers assigned to 
+          each operation. If one operation requires Ctrl and another requires 
+          Ctrl+Shift, the trigger for the operation requiring both modifier keys 
+          should appear *after* the trigger for the operation requiring only one. -->
+            <Trigger Property="AreDragModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+            <Trigger Property="AreZoomToSelectionModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="Cross" />
+            </Trigger>
+            <Trigger Property="AreZoomModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.Zoom}" />
+            </Trigger>
+            <Trigger Property="AreRelativeZoomModifiersActive" Value="True">
+                <Setter Property="Cursor" Value="{x:Static local:ZoomboxCursors.ZoomRelative}" />
+            </Trigger>
+            <!-- The IsDraggingContent and IsSelectingRegion triggers should 
+           always be last. -->
+            <Trigger Property="IsDraggingContent" Value="True">
+                <Setter Property="Cursor" Value="SizeAll" />
+            </Trigger>
+            <Trigger Property="IsSelectingRegion" Value="True">
+                <Setter Property="Cursor" Value="Cross" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+
+
+</ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
index 6727077b7..0ebb9057a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
@@ -1,18 +1,18 @@
-﻿<!--************************************************************************
+﻿<!--***********************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************-->
+  **********************************************************************************-->
 
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
index b302370b4..1d0408a19 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
index 94b56cc6d..bdbd47a32 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System.Reflection;
 using System.Security;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
index 76482918d..124a27aa5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.ComponentModel;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
index 46fdfc54e..1575827c6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using Xceed.Wpf.Toolkit.Core;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
index ce9c09789..1931a414c 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
index 62420e8c6..67cdaa7f2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections.Generic;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
index 0972ffc12..52417ed4f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
index c81c3f674..e2077a890 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Windows;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
index 00ad3e315..ce90e01c5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 
 namespace Xceed.Wpf.Toolkit.Zoombox
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
index d53ad087a..d44acb9d8 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 using System;
 using System.Collections;
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
index 0ff00a4c1..b2cd4d22a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
index 7ba306491..e79fa42f8 100644
--- a/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
@@ -1,18 +1,18 @@
-﻿/************************************************************************
+﻿/*************************************************************************************
 
    Extended WPF Toolkit
 
-   Copyright (C) 2010-2012 Xceed Software Inc.
+   Copyright (C) 2007-2013 Xceed Software Inc.
 
    This program is provided to you under the terms of the Microsoft Public
    License (Ms-PL) as published at http://wpftoolkit.codeplex.com/license 
 
    For more features, controls, and fast professional support,
-   pick up the Plus edition at http://xceed.com/wpf_toolkit
+   pick up the Plus Edition at http://xceed.com/wpf_toolkit
 
-   Visit http://xceed.com and follow @datagrid on Twitter
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
-  **********************************************************************/
+  ***********************************************************************************/
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {